E590 [spec] Fix naming typo · WebAssembly/spec@3233abc · GitHub
[go: up one dir, main page]
Skip to content

Commit 3233abc

Browse files
rossbergrossberg
committed
[spec] Fix naming typo
1 parent 741d6b4 commit 3233abc

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎specification/wasm-2.0/1-syntax.spectec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ syntax vloadop =
395395

396396
syntax blocktype hint(desc "block type") =
397397
| _RESULT valtype?
398-
| _IDX funcidx
398+
| _IDX typeidx
399399

400400
var bt : blocktype
401401

‎specification/wasm-3.0/1.3-syntax.instructions.spectec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ syntax vloadop_(vectype) hint(macro "%" "L%") =
204204

205205
syntax blocktype hint(desc "block type") =
206206
| _RESULT valtype?
207-
| _IDX funcidx
207+
| _IDX typeidx
208208

209209
var bt : blocktype
210210

@@ -422,7 +422,7 @@ def $free_expr(expr) : free
422422
def $free_shape(lanetype X dim) = $free_lanetype(lanetype)
423423

424424
def $free_blocktype(_RESULT valtype?) = $free_opt($free_valtype(valtype)?)
425-
def $free_blocktype(_IDX funcidx) = $free_funcidx(funcidx)
425+
def $free_blocktype(_IDX typeidx) = $free_typeidx(typeidx)
426426

427427

428428
def $free_instr(NOP) = {}

‎spectec/doc/example/output/NanoWasm.pdf‎

-6 Bytes
Binary file not shown.

‎spectec/test-frontend/TEST.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,7 +1945,7 @@ syntax vloadop_{vectype : vectype}(vectype) =
19451945
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
19461946
syntax blocktype =
19471947
| _RESULT{`valtype?` : valtype?}(valtype?{valtype <- `valtype?`} : valtype?)
1948-
| _IDX{funcidx : funcidx}(funcidx : funcidx)
1948+
| _IDX{typeidx : typeidx}(typeidx : typeidx)
19491949

19501950
;; ../../../../specification/wasm-3.0/4.0-execution.configurations.spectec
19511951
syntax addr = nat
@@ -2203,7 +2203,7 @@ def $free_blocktype(blocktype : blocktype) : free
22032203
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
22042204
def $free_blocktype{`valtype?` : valtype?}(_RESULT_blocktype(valtype?{valtype <- `valtype?`})) = $free_opt($free_valtype(valtype)?{valtype <- `valtype?`})
22052205
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
2206-
def $free_blocktype{funcidx : funcidx}(_IDX_blocktype(funcidx)) = $free_funcidx(funcidx)
2206+
def $free_blocktype{typeidx : typeidx}(_IDX_blocktype(typeidx)) = $free_typeidx(typeidx)
22072207

22082208
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
22092209
rec {
@@ -7631,7 +7631,7 @@ grammar Bblocktype : blocktype
76317631
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
76327632
prod{t : valtype} t:Bvaltype => _RESULT_blocktype(?(t))
76337633
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
7634-
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_funcidx((i!`%`_s33.0 : int <:> nat)))
7634+
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_typeidx((i!`%`_s33.0 : int <:> nat)))
76357635
-- if (i!`%`_s33.0 >= (0 : nat <:> int))
76367636

76377637
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec

‎spectec/test-latex/TEST.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3903,7 +3903,7 @@ $$
39033903
$$
39043904
\begin{array}[t]{@{}lrrl@{}l@{}}
39053905
\mbox{(block type)} & {\mathit{blocktype}} & ::= & {{\mathit{valtype}}^?} \\
3906-
& & | & {\mathit{funcidx}} \\
3906+
& & | & {\mathit{typeidx}} \\
39073907
\end{array}
39083908
$$
39093909

@@ -4063,7 +4063,7 @@ $$
40634063
$$
40644064
\begin{array}[t]{@{}lcl@{}l@{}}
40654065
{\mathrm{free}}_{\mathit{blocktype}}({{\mathit{valtype}}^?}) & = & {\mathrm{free}}_{\mathit{opt}}({{\mathrm{free}}_{\mathit{valtype}}({\mathit{valtype}})^?}) \\
4066-
{\mathrm{free}}_{\mathit{blocktype}}({\mathit{funcidx}}) & = & {\mathrm{free}}_{\mathit{funcidx}}({\mathit{funcidx}}) \\
4066+
{\mathrm{free}}_{\mathit{blocktype}}({\mathit{typeidx}}) & = & {\mathrm{free}}_{\mathit{typeidx}}({\mathit{typeidx}}) \\
40674067
\end{array}
40684068
$$
40694069

‎spectec/test-middlend/TEST.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,7 @@ syntax vloadop_{vectype : vectype}(vectype) =
19351935
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
19361936
syntax blocktype =
19371937
| _RESULT{`valtype?` : valtype?}(valtype?{valtype <- `valtype?`} : valtype?)
1938-
| _IDX{funcidx : funcidx}(funcidx : funcidx)
1938+
| _IDX{typeidx : typeidx}(typeidx : typeidx)
19391939

19401940
;; ../../../../specification/wasm-3.0/4.0-execution.configurations.spectec
19411941
syntax addr = nat
@@ -2193,7 +2193,7 @@ def $free_blocktype(blocktype : blocktype) : free
21932193
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
21942194
def $free_blocktype{`valtype?` : valtype?}(_RESULT_blocktype(valtype?{valtype <- `valtype?`})) = $free_opt($free_valtype(valtype)?{valtype <- `valtype?`})
21952195
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
2196-
def $free_blocktype{funcidx : funcidx}(_IDX_blocktype(funcidx)) = $free_funcidx(funcidx)
2196+
def $free_blocktype{typeidx : typeidx}(_IDX_blocktype(typeidx)) = $free_typeidx(typeidx)
21972197

21982198
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
21992199
rec {
@@ -7621,7 +7621,7 @@ grammar Bblocktype : blocktype
76217621
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
76227622
prod{t : valtype} t:Bvaltype => _RESULT_blocktype(?(t))
76237623
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
7624-
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_funcidx((i!`%`_s33.0 : int <:> nat)))
7624+
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_typeidx((i!`%`_s33.0 : int <:> nat)))
76257625
-- if (i!`%`_s33.0 >= (0 : nat <:> int))
76267626

76277627
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
@@ -13276,7 +13276,7 @@ syntax vloadop_{vectype : vectype}(vectype) =
1327613276
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
1327713277
syntax blocktype =
1327813278
| _RESULT{`valtype?` : valtype?}(valtype?{valtype <- `valtype?`} : valtype?)
13279-
| _IDX{funcidx : funcidx}(funcidx : funcidx)
13279+
| _IDX{typeidx : typeidx}(typeidx : typeidx)
1328013280

1328113281
;; ../../../../specification/wasm-3.0/4.0-execution.configurations.spectec
1328213282
syntax addr = nat
@@ -13534,7 +13534,7 @@ def $free_blocktype(blocktype : blocktype) : free
1353413534
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
1353513535
def $free_blocktype{`valtype?` : valtype?}(_RESULT_blocktype(valtype?{valtype <- `valtype?`})) = $free_opt($free_valtype(valtype)?{valtype <- `valtype?`})
1353613536
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
13537-
def $free_blocktype{funcidx : funcidx}(_IDX_blocktype(funcidx)) = $free_funcidx(funcidx)
13537+
def $free_blocktype{typeidx : typeidx}(_IDX_blocktype(typeidx)) = $free_typeidx(typeidx)
1353813538

1353913539
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
1354013540
rec {
@@ -18964,7 +18964,7 @@ grammar Bblocktype : blocktype
1896418964
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
1896518965
prod{t : valtype} t:Bvaltype => _RESULT_blocktype(?(t))
1896618966
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
18967-
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_funcidx((i!`%`_s33.0 : int <:> nat)))
18967+
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_typeidx((i!`%`_s33.0 : int <:> nat)))
1896818968
-- if (i!`%`_s33.0 >= (0 : nat <:> int))
1896918969

1897018970
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
@@ -24619,7 +24619,7 @@ syntax vloadop_{vectype : vectype}(vectype) =
2461924619
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
2462024620
syntax blocktype =
2462124621
| _RESULT{`valtype?` : valtype?}(valtype?{valtype <- `valtype?`} : valtype?)
24622-
| _IDX{funcidx : funcidx}(funcidx : funcidx)
24622+
| _IDX{typeidx : typeidx}(typeidx : typeidx)
2462324623

2462424624
;; ../../../../specification/wasm-3.0/4.0-execution.configurations.spectec
2462524625
syntax addr = nat
@@ -24877,7 +24877,7 @@ def $free_blocktype(blocktype : blocktype) : free
2487724877
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
2487824878
def $free_blocktype{`valtype?` : valtype?}(_RESULT_blocktype(valtype?{valtype <- `valtype?`})) = $free_opt($free_valtype(valtype)?{valtype <- `valtype?`})
2487924879
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
24880-
def $free_blocktype{funcidx : funcidx}(_IDX_blocktype(funcidx)) = $free_funcidx(funcidx)
24880+
def $free_blocktype{typeidx : typeidx}(_IDX_blocktype(typeidx)) = $free_typeidx(typeidx)
2488124881

2488224882
;; ../../../../specification/wasm-3.0/1.3-syntax.instructions.spectec
2488324883
rec {
@@ -30486,7 +30486,7 @@ grammar Bblocktype : blocktype
3048630486
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
3048730487
prod{t : valtype} t:Bvaltype => _RESULT_blocktype(?(t))
3048830488
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec
30489-
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_funcidx((i!`%`_s33.0 : int <:> nat)))
30489+
prod{i : s33} i:Bs33 => _IDX_blocktype(`%`_typeidx((i!`%`_s33.0 : int <:> nat)))
3049030490
-- if (i!`%`_s33.0 >= (0 : nat <:> int))
3049130491

3049230492
;; ../../../../specification/wasm-3.0/5.3-binary.instructions.spectec

‎spectec/test-prose/TEST.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10129,7 +10129,7 @@ The module :math:`(\mathsf{module}~{{\mathit{type}}^\ast}~{{\mathit{import}}^\as
1012910129

1013010130
#) Return :math:`\epsilon~\rightarrow~t`.
1013110131

10132-
#. Assert: Due to validation, :math:`{\mathit{blocktype}}` is some :math:`{\mathit{funcidx}}`.
10132+
#. Assert: Due to validation, :math:`{\mathit{blocktype}}` is some :math:`{\mathit{typeidx}}`.
1013310133

1013410134
#. Let :math:`x` be the block type :math:`{\mathit{blocktype}}`.
1013510135

@@ -22680,11 +22680,11 @@ The instruction sequence :math:`(\mathsf{block}~{\mathit{blocktype}}~{{\mathit{i
2268022680

2268122681
#. Return :math:`{\mathrm{free}}_{\mathit{opt}}({{\mathrm{free}}_{\mathit{valtype}}({\mathit{valtype}})^?})`.
2268222682

22683-
#. Assert: Due to validation, :math:`{\mathit{blocktype}}` is some :math:`{\mathit{funcidx}}`.
22683+
#. Assert: Due to validation, :math:`{\mathit{blocktype}}` is some :math:`{\mathit{typeidx}}`.
2268422684

22685-
#. Let :math:`{\mathit{funcidx}}` be the block type :math:`{\mathit{blocktype}}`.
22685+
#. Let :math:`{\mathit{typeidx}}` be the block type :math:`{\mathit{blocktype}}`.
2268622686

22687-
#. Return :math:`{\mathrm{free}}_{\mathit{funcidx}}({\mathit{funcidx}})`.
22687+
#. Return :math:`{\mathrm{free}}_{\mathit{typeidx}}({\mathit{typeidx}})`.
2268822688

2268922689

2269022690
:math:`{\mathrm{shift}}_{\mathit{labelidxs}}({{\mathit{labelidx}''}^\ast})`
@@ -25784,7 +25784,7 @@ The instruction sequence :math:`(\mathsf{block}~{\mathit{blocktype}}~{{\mathit{i
2578425784
........................................................
2578525785

2578625786

25787-
1. If :math:`{\mathit{blocktype}}` is some :math:`{\mathit{funcidx}}`, then:
25787+
1. If :math:`{\mathit{blocktype}}` is some :math:`{\mathit{typeidx}}`, then:
2578825788

2578925789
a. Let :math:`x` be the block type :math:`{\mathit{blocktype}}`.
2579025790

@@ -31085,8 +31085,8 @@ free_blocktype blocktype
3108531085
a. Let (_RESULT valtype?) be blocktype.
3108631086
b. Return $free_opt($free_valtype(valtype)?).
3108731087
2. Assert: Due to validation, blocktype is some _IDX.
31088-
3. Let (_IDX funcidx) be blocktype.
31089-
4. Return $free_funcidx(funcidx).
31088+
3. Let (_IDX typeidx) be blocktype.
31089+
4. Return $free_typeidx(typeidx).
3109031090

3109131091
shift_labelidxs labelidx''*
3109231092
1. If (labelidx''* = []), then:

0 commit comments

Comments
 (0)
0