Skip to content

Commit 434fe2f

Browse files
sunfishcodesunfishcode
committedJun 2, 2017
update to spec repo c4774b47d326e4114f96232f1389a555639d7348
1 parent c4ec004 commit 434fe2f

38 files changed

+3031
-2745
lines changed
 

‎block.wast

+71-43
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,79 @@
1111

1212
(func (export "singular") (result i32)
1313
(block (nop))
14-
(block i32 (i32.const 7))
14+
(block (result i32) (i32.const 7))
1515
)
1616

1717
(func (export "multi") (result i32)
1818
(block (call $dummy) (call $dummy) (call $dummy) (call $dummy))
19-
(block i32 (call $dummy) (call $dummy) (call $dummy) (i32.const 8))
19+
(block (result i32) (call $dummy) (call $dummy) (call $dummy) (i32.const 8))
2020
)
2121

2222
(func (export "nested") (result i32)
23-
(block i32
23+
(block (result i32)
2424
(block (call $dummy) (block) (nop))
25-
(block i32 (call $dummy) (i32.const 9))
25+
(block (result i32) (call $dummy) (i32.const 9))
2626
)
2727
)
2828

2929
(func (export "deep") (result i32)
30-
(block i32 (block i32 (block i32 (block i32 (block i32 (block i32
31-
(block i32 (block i32 (block i32 (block i32 (block i32 (block i32
32-
(block i32 (block i32 (block i32 (block i32 (block i32 (block i32
33-
(block i32 (block i32 (block i32 (block i32 (block i32 (block i32
34-
(block i32 (block i32 (block i32 (block i32 (block i32 (block i32
35-
(block i32 (block i32 (block i32 (block i32 (block i32 (block i32
36-
(block i32 (block i32 (call $dummy) (i32.const 150)))
37-
))))))
38-
))))))
39-
))))))
40-
))))))
41-
))))))
42-
))))))
30+
(block (result i32) (block (result i32)
31+
(block (result i32) (block (result i32)
32+
(block (result i32) (block (result i32)
33+
(block (result i32) (block (result i32)
34+
(block (result i32) (block (result i32)
35+
(block (result i32) (block (result i32)
36+
(block (result i32) (block (result i32)
37+
(block (result i32) (block (result i32)
38+
(block (result i32) (block (result i32)
39+
(block (result i32) (block (result i32)
40+
(block (result i32) (block (result i32)
41+
(block (result i32) (block (result i32)
42+
(block (result i32) (block (result i32)
43+
(block (result i32) (block (result i32)
44+
(block (result i32) (block (result i32)
45+
(block (result i32) (block (result i32)
46+
(block (result i32) (block (result i32)
47+
(block (result i32) (block (result i32)
48+
(block (result i32) (block (result i32)
49+
(call $dummy) (i32.const 150)
50+
))
51+
))
52+
))
53+
))
54+
))
55+
))
56+
))
57+
))
58+
))
59+
))
60+
))
61+
))
62+
))
63+
))
64+
))
65+
))
66+
))
67+
))
68+
))
4369
)
4470

4571
(func (export "as-unary-operand") (result i32)
46-
(i32.ctz (block i32 (call $dummy) (i32.const 13)))
72+
(i32.ctz (block (result i32) (call $dummy) (i32.const 13)))
4773
)
4874
(func (export "as-binary-operand") (result i32)
4975
(i32.mul
50-
(block i32 (call $dummy) (i32.const 3))
51-
(block i32 (call $dummy) (i32.const 4))
76+
(block (result i32) (call $dummy) (i32.const 3))
77+
(block (result i32) (call $dummy) (i32.const 4))
5278
)
5379
)
5480
(func (export "as-test-operand") (result i32)
55-
(i32.eqz (block i32 (call $dummy) (i32.const 13)))
81+
(i32.eqz (block (result i32) (call $dummy) (i32.const 13)))
5682
)
5783
(func (export "as-compare-operand") (result i32)
5884
(f32.gt
59-
(block f32 (call $dummy) (f32.const 3))
60-
(block f32 (call $dummy) (f32.const 3))
85+
(block (result f32) (call $dummy) (f32.const 3))
86+
(block (result f32) (call $dummy) (f32.const 3))
6187
)
6288
)
6389

@@ -69,10 +95,10 @@
6995
(i32.const 19)
7096
)
7197
(func (export "break-value") (result i32)
72-
(block i32 (br 0 (i32.const 18)) (i32.const 19))
98+
(block (result i32) (br 0 (i32.const 18)) (i32.const 19))
7399
)
74100
(func (export "break-repeated") (result i32)
75-
(block i32
101+
(block (result i32)
76102
(br 0 (i32.const 18))
77103
(br 0 (i32.const 19))
78104
(drop (br_if 0 (i32.const 20) (i32.const 0)))
@@ -86,13 +112,13 @@
86112
(func (export "break-inner") (result i32)
87113
(local i32)
88114
(set_local 0 (i32.const 0))
89-
(set_local 0 (i32.add (get_local 0) (block i32 (block i32 (br 1 (i32.const 0x1))))))
90-
(set_local 0 (i32.add (get_local 0) (block i32 (block (br 0)) (i32.const 0x2))))
115+
(set_local 0 (i32.add (get_local 0) (block (result i32) (block (result i32) (br 1 (i32.const 0x1))))))
116+
(set_local 0 (i32.add (get_local 0) (block (result i32) (block (br 0)) (i32.const 0x2))))
91117
(set_local 0
92-
(i32.add (get_local 0) (block i32 (i32.ctz (br 0 (i32.const 0x4)))))
118+
(i32.add (get_local 0) (block (result i32) (i32.ctz (br 0 (i32.const 0x4)))))
93119
)
94120
(set_local 0
95-
(i32.add (get_local 0) (block i32 (i32.ctz (block i32 (br 1 (i32.const 0x8))))))
121+
(i32.add (get_local 0) (block (result i32) (i32.ctz (block (result i32) (br 1 (i32.const 0x8))))))
96122
)
97123
(get_local 0)
98124
)
@@ -154,89 +180,91 @@
154180
)
155181
(assert_invalid
156182
(module (func $type-value-empty-vs-num (result i32)
157-
(block i32)
183+
(block (result i32))
158184
))
159185
"type mismatch"
160186
)
161187
(assert_invalid
162188
(module (func $type-value-void-vs-num (result i32)
163-
(block i32 (nop))
189+
(block (result i32) (nop))
164190
))
165191
"type mismatch"
166192
)
167193
(assert_invalid
168194
(module (func $type-value-num-vs-num (result i32)
169-
(block i32 (f32.const 0))
195+
(block (result i32) (f32.const 0))
170196
))
171197
"type mismatch"
172198
)
173199
(assert_invalid
174200
(module (func $type-value-unreached-select (result i32)
175-
(block i64 (select (unreachable) (unreachable) (unreachable)))
201+
(block (result i64) (select (unreachable) (unreachable) (unreachable)))
176202
))
177203
"type mismatch"
178204
)
179205

180206
(assert_invalid
181207
(module (func $type-break-last-void-vs-num (result i32)
182-
(block i32 (br 0))
208+
(block (result i32) (br 0))
183209
))
184210
"type mismatch"
185211
)
186212
(assert_invalid
187213
(module (func $type-break-empty-vs-num (result i32)
188-
(block i32 (br 0) (i32.const 1))
214+
(block (result i32) (br 0) (i32.const 1))
189215
))
190216
"type mismatch"
191217
)
192218

193219
(assert_invalid
194220
(module (func $type-break-void-vs-num (result i32)
195-
(block i32 (br 0 (nop)) (i32.const 1))
221+
(block (result i32) (br 0 (nop)) (i32.const 1))
196222
))
197223
"type mismatch"
198224
)
199225
(assert_invalid
200226
(module (func $type-break-num-vs-num (result i32)
201-
(block i32 (br 0 (i64.const 1)) (i32.const 1))
227+
(block (result i32) (br 0 (i64.const 1)) (i32.const 1))
202228
))
203229
"type mismatch"
204230
)
205231
(assert_invalid
206232
(module (func $type-break-first-void-vs-num (result i32)
207-
(block i32 (br 0 (nop)) (br 0 (i32.const 1)))
233+
(block (result i32) (br 0 (nop)) (br 0 (i32.const 1)))
208234
))
209235
"type mismatch"
210236
)
211237
(assert_invalid
212238
(module (func $type-break-first-num-vs-num (result i32)
213-
(block i32 (br 0 (i64.const 1)) (br 0 (i32.const 1)))
239+
(block (result i32) (br 0 (i64.const 1)) (br 0 (i32.const 1)))
214240
))
215241
"type mismatch"
216242
)
217243

218244
(assert_invalid
219245
(module (func $type-break-nested-num-vs-void
220-
(block i32 (block i32 (br 1 (i32.const 1))) (br 0))
246+
(block (result i32) (block (result i32) (br 1 (i32.const 1))) (br 0))
221247
))
222248
"type mismatch"
223249
)
224250
(assert_invalid
225251
(module (func $type-break-nested-empty-vs-num (result i32)
226-
(block i32 (block (br 1)) (br 0 (i32.const 1)))
252+
(block (result i32) (block (br 1)) (br 0 (i32.const 1)))
227253
))
228254
"type mismatch"
229255
)
230256

231257
(assert_invalid
232258
(module (func $type-break-nested-void-vs-num (result i32)
233-
(block i32 (block i32 (br 1 (nop))) (br 0 (i32.const 1)))
259+
(block (result i32) (block (result i32) (br 1 (nop))) (br 0 (i32.const 1)))
234260
))
235261
"type mismatch"
236262
)
237263
(assert_invalid
238264
(module (func $type-break-nested-num-vs-num (result i32)
239-
(block i32 (block i32 (br 1 (i64.const 1))) (br 0 (i32.const 1)))
265+
(block (result i32)
266+
(block (result i32) (br 1 (i64.const 1))) (br 0 (i32.const 1))
267+
)
240268
))
241269
"type mismatch"
242270
)

0 commit comments

Comments
 (0)
Please sign in to comment.