Skip to content

[Parser] Go back to "sub final" intead of "sub open" #6199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tlively merged 1 commit into from
Jan 3, 2024
Merged

[Parser] Go back to "sub final" intead of "sub open" #6199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[Parser] Go back to "sub final" intead of "sub open" 
The planned spec change to use "sub open" never came together, so the standard
format remains "sub final".
  • Loading branch information
@tlively
tlively committed Jan 3, 2024
commit 06d5a6c1b2ce7918afdef83096fc535b487e35e1
2 changes: 1 addition & 1 deletion src/parser/parsers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,7 +2094,7 @@ template<typename Ctx> MaybeResult<> subtype(Ctx& ctx) {
}

if (ctx.in.takeSExprStart("sub"sv)) {
if (ctx.in.takeKeyword("open"sv)) {
if (!ctx.in.takeKeyword("final"sv)) {
ctx.setOpen();
}
if (auto super = maybeTypeidx(ctx)) {
Expand Down
10 changes: 5 additions & 5 deletions test/lit/wat-kitchen-sink.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

;; CHECK: (rec
;; CHECK-NEXT: (type $s0 (struct ))
(type $s0 (sub (struct)))
(type $s0 (struct))
;; CHECK: (type $s1 (struct ))
(type $s1 (struct (field)))
)
Expand Down Expand Up @@ -198,17 +198,17 @@
(type $any-array (array (mut anyref)))

(rec
(type $void (sub open (func)))
(type $void (sub (func)))
)

;; CHECK: (type $subvoid (sub final $void (func)))
(type $subvoid (sub $void (func)))
(type $subvoid (sub final $void (func)))

(type $many (sub open (func (param $x i32) (param i64 f32) (param) (param $y f64)
(type $many (sub (func (param $x i32) (param i64 f32) (param) (param $y f64)
(result anyref (ref func)))))

;; CHECK: (type $submany (sub final $many (func (param i32 i64 f32 f64) (result anyref (ref func)))))
(type $submany (sub $many (func (param i32 i64 f32 f64) (result anyref (ref func)))))
(type $submany (sub final $many (func (param i32 i64 f32 f64) (result anyref (ref func)))))

;; imported memories
(memory (export "mem") (export "mem2") (import "" "mem") 0)
Expand Down