Skip to content

Commit e3f6090

Browse files
alexcrichtonalexcrichton
committed
Revert "Update GC proposal parsing (#55)"
This reverts commit 99c8f9c.
1 parent 99c8f9c commit e3f6090

File tree

8 files changed

+153
-439
lines changed

8 files changed

+153
-439
lines changed

‎crates/wast/src/ast/expr.rs

+12-82
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl<'a> ExpressionParser<'a> {
117117
// If block/loop show up then we just need to be sure to
118118
// push an `end` instruction whenever the `)` token is
119119
// seen
120-
i @ Instruction::Block(_) | i @ Instruction::Loop(_) | i @ Instruction::Let(_) => {
120+
i @ Instruction::Block(_) | i @ Instruction::Loop(_) => {
121121
self.instrs.push(i);
122122
self.stack.push(Level::EndWith(Instruction::End(None)));
123123
}
@@ -361,7 +361,6 @@ instructions! {
361361
CallRef : [0x14] : "call_ref",
362362
ReturnCallRef : [0x15] : "return_call_ref",
363363
FuncBind(ast::Index<'a>) : [0x16] : "func.bind",
364-
Let(LetType<'a>) : [0x17] : "let",
365364

366365
Drop : [0x1a] : "drop",
367366
Select(SelectTypes<'a>) : [] : "select",
@@ -425,19 +424,19 @@ instructions! {
425424
RefEq : [0xd5] : "ref.eq",
426425

427426
// gc proposal: struct
428-
StructNewWithRtt(ast::Index<'a>) : [0xfb, 0x01] : "struct.new_with_rtt",
429-
StructNewDefaultWithRtt(ast::Index<'a>) : [0xfb, 0x02] : "struct.new_default_with_rtt",
427+
StructNew(ast::Index<'a>) : [0xfb, 0x00] : "struct.new",
428+
StructNewSub(ast::Index<'a>) : [0xfb, 0x01] : "struct.new_sub",
429+
StructNewDefault(ast::Index<'a>) : [0xfb, 0x02] : "struct.new_default",
430430
StructGet(StructAccess<'a>) : [0xfb, 0x03] : "struct.get",
431431
StructGetS(StructAccess<'a>) : [0xfb, 0x04] : "struct.get_s",
432432
StructGetU(StructAccess<'a>) : [0xfb, 0x05] : "struct.get_u",
433433
StructSet(StructAccess<'a>) : [0xfb, 0x06] : "struct.set",
434-
435-
// gc proposal (moz specific, will be removed)
436434
StructNarrow(StructNarrow<'a>) : [0xfb, 0x07] : "struct.narrow",
437435

438436
// gc proposal: array
439-
ArrayNewWithRtt(ast::Index<'a>) : [0xfb, 0x11] : "array.new_with_rtt",
440-
ArrayNewDefaultWithRtt(ast::Index<'a>) : [0xfb, 0x12] : "array.new_default_with_rtt",
437+
ArrayNew(ast::Index<'a>) : [0xfb, 0x10] : "array.new",
438+
ArrayNewSub(ast::Index<'a>) : [0xfb, 0x11] : "array.new_sub",
439+
ArrayNewDefault(ast::Index<'a>) : [0xfb, 0x12] : "array.new_default",
441440
ArrayGet(ast::Index<'a>) : [0xfb, 0x13] : "array.get",
442441
ArrayGetS(ast::Index<'a>) : [0xfb, 0x14] : "array.get_s",
443442
ArrayGetU(ast::Index<'a>) : [0xfb, 0x15] : "array.get_u",
@@ -450,11 +449,11 @@ instructions! {
450449
I31GetU : [0xfb, 0x22] : "i31.get_u",
451450

452451
// gc proposal, rtt/casting
453-
RTTCanon(HeapType<'a>) : [0xfb, 0x30] : "rtt.canon",
454-
RTTSub(RTTSub<'a>) : [0xfb, 0x31] : "rtt.sub",
455-
RefTest(RefTest<'a>) : [0xfb, 0x40] : "ref.test",
456-
RefCast(RefTest<'a>) : [0xfb, 0x41] : "ref.cast",
457-
BrOnCast(BrOnCast<'a>) : [0xfb, 0x42] : "br_on_cast",
452+
RTTGet(ast::Index<'a>) : [0xfb, 0x30] : "rtt.get",
453+
RTTSub(ast::Index<'a>) : [0xfb, 0x31] : "rtt.sub",
454+
RefTest : [0xfb, 0x40] : "ref.test",
455+
RefCast : [0xfb, 0x41] : "ref.cast",
456+
BrOnCast(ast::Index<'a>) : [0xfb, 0x42] : "br_on_cast",
458457

459458
I32Const(i32) : [0x41] : "i32.const",
460459
I64Const(i64) : [0x42] : "i64.const",
@@ -912,23 +911,6 @@ impl<'a> Parse<'a> for BlockType<'a> {
912911
}
913912
}
914913

915-
/// Extra information associated with the let instruction.
916-
#[derive(Debug)]
917-
#[allow(missing_docs)]
918-
pub struct LetType<'a> {
919-
pub block: BlockType<'a>,
920-
pub locals: Vec<ast::Local<'a>>,
921-
}
922-
923-
impl<'a> Parse<'a> for LetType<'a> {
924-
fn parse(parser: Parser<'a>) -> Result<Self> {
925-
Ok(LetType {
926-
block: parser.parse()?,
927-
locals: ast::Local::parse_remainder(parser)?,
928-
})
929-
}
930-
}
931-
932914
/// Extra information associated with the `br_table` instruction.
933915
#[allow(missing_docs)]
934916
#[derive(Debug)]
@@ -1382,55 +1364,3 @@ impl<'a> Parse<'a> for BrOnExn<'a> {
13821364
Ok(BrOnExn { label, exn })
13831365
}
13841366
}
1385-
1386-
/// Payload of the `br_on_cast` instruction
1387-
#[derive(Debug)]
1388-
#[allow(missing_docs)]
1389-
pub struct BrOnCast<'a> {
1390-
pub label: ast::Index<'a>,
1391-
pub val: HeapType<'a>,
1392-
pub rtt: HeapType<'a>,
1393-
}
1394-
1395-
impl<'a> Parse<'a> for BrOnCast<'a> {
1396-
fn parse(parser: Parser<'a>) -> Result<Self> {
1397-
let label = parser.parse()?;
1398-
let val = parser.parse()?;
1399-
let rtt = parser.parse()?;
1400-
Ok(BrOnCast { label, val, rtt })
1401-
}
1402-
}
1403-
1404-
/// Payload of the `rtt.sub` instruction
1405-
#[derive(Debug)]
1406-
#[allow(missing_docs)]
1407-
pub struct RTTSub<'a> {
1408-
pub depth: u32,
1409-
pub input_rtt: HeapType<'a>,
1410-
pub output_rtt: HeapType<'a>,
1411-
}
1412-
1413-
impl<'a> Parse<'a> for RTTSub<'a> {
1414-
fn parse(parser: Parser<'a>) -> Result<Self> {
1415-
let depth = parser.parse()?;
1416-
let input_rtt = parser.parse()?;
1417-
let output_rtt = parser.parse()?;
1418-
Ok(RTTSub { depth, input_rtt, output_rtt })
1419-
}
1420-
}
1421-
1422-
/// Payload of the `ref.test/cast` instruction
1423-
#[derive(Debug)]
1424-
#[allow(missing_docs)]
1425-
pub struct RefTest<'a> {
1426-
pub val: HeapType<'a>,
1427-
pub rtt: HeapType<'a>,
1428-
}
1429-
1430-
impl<'a> Parse<'a> for RefTest<'a> {
1431-
fn parse(parser: Parser<'a>) -> Result<Self> {
1432-
let val = parser.parse()?;
1433-
let rtt = parser.parse()?;
1434-
Ok(RefTest { val, rtt })
1435-
}
1436-
}

‎crates/wast/src/ast/func.rs

+26-42
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,14 @@ pub enum FuncKind<'a> {
3535

3636
/// Almost all functions, those defined inline in a wasm module.
3737
Inline {
38-
/// The list of locals, if any, for this function.
39-
locals: Vec<Local<'a>>,
38+
/// The list of locals, if any, for this function. Each local has an
39+
/// optional identifier for name resolution and name for the custom
40+
/// `name` section associated with it.
41+
locals: Vec<(
42+
Option<ast::Id<'a>>,
43+
Option<ast::NameAnnotation<'a>>,
44+
ast::ValType<'a>,
45+
)>,
4046

4147
/// The instructions of the function.
4248
expression: ast::Expression<'a>,
@@ -54,7 +60,24 @@ impl<'a> Parse<'a> for Func<'a> {
5460
(parser.parse()?, FuncKind::Import(import))
5561
} else {
5662
let ty = parser.parse()?;
57-
let locals = Local::parse_remainder(parser)?;
63+
let mut locals = Vec::new();
64+
while parser.peek2::<kw::local>() {
65+
parser.parens(|p| {
66+
p.parse::<kw::local>()?;
67+
if p.is_empty() {
68+
return Ok(());
69+
}
70+
let id: Option<_> = p.parse()?;
71+
let name: Option<_> = p.parse()?;
72+
let ty = p.parse()?;
73+
let parse_more = id.is_none() && name.is_none();
74+
locals.push((id, name, ty));
75+
while parse_more && !p.is_empty() {
76+
locals.push((None, None, p.parse()?));
77+
}
78+
Ok(())
79+
})?;
80+
}
5881
(
5982
ty,
6083
FuncKind::Inline {
@@ -74,42 +97,3 @@ impl<'a> Parse<'a> for Func<'a> {
7497
})
7598
}
7699
}
77-
78-
/// A local for a `func` or `let` instruction.
79-
///
80-
/// Each local has an optional identifier for name resolution, an optional name
81-
/// for the custom `name` section, and a value type.
82-
#[derive(Debug)]
83-
pub struct Local<'a> {
84-
/// An identifier that this local is resolved with (optionally) for name
85-
/// resolution.
86-
pub id: Option<ast::Id<'a>>,
87-
/// An optional name for this local stored in the custom `name` section.
88-
pub name: Option<ast::NameAnnotation<'a>>,
89-
/// The value type of this local.
90-
pub ty: ast::ValType<'a>,
91-
}
92-
93-
impl<'a> Local<'a> {
94-
pub(crate) fn parse_remainder(parser: Parser<'a>) -> Result<Vec<Local<'a>>> {
95-
let mut locals = Vec::new();
96-
while parser.peek2::<kw::local>() {
97-
parser.parens(|p| {
98-
p.parse::<kw::local>()?;
99-
if p.is_empty() {
100-
return Ok(());
101-
}
102-
let id: Option<_> = p.parse()?;
103-
let name: Option<_> = p.parse()?;
104-
let ty = p.parse()?;
105-
let parse_more = id.is_none() && name.is_none();
106-
locals.push(Local { id, name, ty });
107-
while parse_more && !p.is_empty() {
108-
locals.push(Local { id: None, name: None, ty: p.parse()? });
109-
}
110-
Ok(())
111-
})?;
112-
}
113-
Ok(locals)
114-
}
115-
}

‎crates/wast/src/ast/types.rs

+16-49
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ pub enum ValType<'a> {
1010
F32,
1111
F64,
1212
V128,
13+
I8,
14+
I16,
1315
Ref(RefType<'a>),
14-
Rtt(u32, ast::Index<'a>),
16+
Rtt(ast::Index<'a>),
1517
}
1618

1719
impl<'a> Parse<'a> for ValType<'a> {
@@ -32,14 +34,20 @@ impl<'a> Parse<'a> for ValType<'a> {
3234
} else if l.peek::<kw::v128>() {
3335
parser.parse::<kw::v128>()?;
3436
Ok(ValType::V128)
37+
} else if l.peek::<kw::i8>() {
38+
parser.parse::<kw::i8>()?;
39+
Ok(ValType::I8)
40+
} else if l.peek::<kw::i16>() {
41+
parser.parse::<kw::i16>()?;
42+
Ok(ValType::I16)
3543
} else if l.peek::<RefType>() {
3644
Ok(ValType::Ref(parser.parse()?))
3745
} else if l.peek::<ast::LParen>() {
3846
parser.parens(|p| {
3947
let mut l = p.lookahead1();
4048
if l.peek::<kw::rtt>() {
4149
p.parse::<kw::rtt>()?;
42-
Ok(ValType::Rtt(p.parse()?, p.parse()?))
50+
Ok(ValType::Rtt(p.parse()?))
4351
} else {
4452
Err(l.error())
4553
}
@@ -50,21 +58,6 @@ impl<'a> Parse<'a> for ValType<'a> {
5058
}
5159
}
5260

53-
impl<'a> Peek for ValType<'a> {
54-
fn peek(cursor: Cursor<'_>) -> bool {
55-
kw::i32::peek(cursor) ||
56-
kw::i64::peek(cursor) ||
57-
kw::f32::peek(cursor) ||
58-
kw::f64::peek(cursor) ||
59-
kw::v128::peek(cursor) ||
60-
(ast::LParen::peek(cursor) && kw::rtt::peek2(cursor)) ||
61-
RefType::peek(cursor)
62-
}
63-
fn display() -> &'static str {
64-
"valtype"
65-
}
66-
}
67-
6861
/// A heap type for a reference type
6962
#[allow(missing_docs)]
7063
#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
@@ -245,32 +238,6 @@ impl<'a> Peek for RefType<'a> {
245238
}
246239
}
247240

248-
/// The types of values that may be used in a struct or array.
249-
#[allow(missing_docs)]
250-
#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
251-
pub enum StorageType<'a> {
252-
I8,
253-
I16,
254-
Val(ValType<'a>),
255-
}
256-
257-
impl<'a> Parse<'a> for StorageType<'a> {
258-
fn parse(parser: Parser<'a>) -> Result<Self> {
259-
let mut l = parser.lookahead1();
260-
if l.peek::<kw::i8>() {
261-
parser.parse::<kw::i8>()?;
262-
Ok(StorageType::I8)
263-
} else if l.peek::<kw::i16>() {
264-
parser.parse::<kw::i16>()?;
265-
Ok(StorageType::I16)
266-
} else if l.peek::<ValType>() {
267-
Ok(StorageType::Val(parser.parse()?))
268-
} else {
269-
Err(l.error())
270-
}
271-
}
272-
}
273-
274241
/// Type for a `global` in a wasm module
275242
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
276243
pub struct GlobalType<'a> {
@@ -502,8 +469,8 @@ pub struct StructField<'a> {
502469
pub id: Option<ast::Id<'a>>,
503470
/// Whether this field may be mutated or not.
504471
pub mutable: bool,
505-
/// The storage type stored in this field.
506-
pub ty: StorageType<'a>,
472+
/// The value type stored in this field.
473+
pub ty: ValType<'a>,
507474
}
508475

509476
impl<'a> StructField<'a> {
@@ -516,7 +483,7 @@ impl<'a> StructField<'a> {
516483
})?;
517484
(ty, true)
518485
} else {
519-
(parser.parse::<StorageType<'a>>()?, false)
486+
(parser.parse::<ValType<'a>>()?, false)
520487
};
521488
Ok(StructField { id, mutable, ty })
522489
}
@@ -527,8 +494,8 @@ impl<'a> StructField<'a> {
527494
pub struct ArrayType<'a> {
528495
/// Whether this field may be mutated or not.
529496
pub mutable: bool,
530-
/// The storage type stored in this field.
531-
pub ty: StorageType<'a>,
497+
/// The value type stored in this field.
498+
pub ty: ValType<'a>,
532499
}
533500

534501
impl<'a> Parse<'a> for ArrayType<'a> {
@@ -540,7 +507,7 @@ impl<'a> Parse<'a> for ArrayType<'a> {
540507
})?;
541508
(ty, true)
542509
} else {
543-
(parser.parse::<StorageType<'a>>()?, false)
510+
(parser.parse::<ValType<'a>>()?, false)
544511
};
545512
Ok(ArrayType { mutable, ty })
546513
}

0 commit comments

Comments
 (0)