summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binary-writer-spec.cc9
-rw-r--r--src/feature.cc7
-rw-r--r--src/feature.h11
-rw-r--r--src/interp/interp.cc24
-rw-r--r--src/ir.h7
-rw-r--r--src/lexer-keywords.txt1
-rw-r--r--src/prebuilt/lexer-keywords.cc1050
-rw-r--r--src/resolve-names.cc1
-rw-r--r--src/token.def1
-rw-r--r--src/tools/spectest-interp.cc55
-rw-r--r--src/validator.cc7
-rw-r--r--src/wast-parser.cc29
12 files changed, 563 insertions, 639 deletions
diff --git a/src/binary-writer-spec.cc b/src/binary-writer-spec.cc
index d547f7d6..d730b9b7 100644
--- a/src/binary-writer-spec.cc
+++ b/src/binary-writer-spec.cc
@@ -130,7 +130,6 @@ void BinaryWriterSpec::WriteCommandType(const Command& command) {
"assert_unlinkable",
"assert_uninstantiable",
"assert_return",
- "assert_return_func",
"assert_trap",
"assert_exhaustion",
};
@@ -496,14 +495,6 @@ void BinaryWriterSpec::WriteCommands() {
break;
}
- case CommandType::AssertReturnFunc: {
- auto* assert_return_command = cast<AssertReturnFuncCommand>(command);
- WriteLocation(assert_return_command->action->loc);
- WriteSeparator();
- WriteAction(*assert_return_command->action);
- break;
- }
-
case CommandType::AssertTrap: {
auto* assert_trap_command = cast<AssertTrapCommand>(command);
WriteLocation(assert_trap_command->action->loc);
diff --git a/src/feature.cc b/src/feature.cc
index 0a43a69c..7f521ca2 100644
--- a/src/feature.cc
+++ b/src/feature.cc
@@ -36,4 +36,11 @@ void Features::AddOptions(OptionParser* parser) {
[this]() { EnableAll(); });
}
+void Features::UpdateDependencies() {
+ // Reference types requires bulk memory.
+ if (reference_types_enabled_) {
+ bulk_memory_enabled_ = true;
+ }
+}
+
} // namespace wabt
diff --git a/src/feature.h b/src/feature.h
index 61ecec7c..7ebc9ef8 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -35,13 +35,18 @@ class Features {
#define WABT_FEATURE(variable, flag, default_, help) \
bool variable##_enabled() const { return variable##_enabled_; } \
- void enable_##variable() { variable##_enabled_ = true; } \
- void disable_##variable() { variable##_enabled_ = false; } \
- void set_##variable##_enabled(bool value) { variable##_enabled_ = value; }
+ void enable_##variable() { set_##variable##_enabled(true); } \
+ void disable_##variable() { set_##variable##_enabled(false); } \
+ void set_##variable##_enabled(bool value) { \
+ variable##_enabled_ = value; \
+ UpdateDependencies(); \
+ }
#include "src/feature.def"
#undef WABT_FEATURE
private:
+ void UpdateDependencies();
+
#define WABT_FEATURE(variable, flag, default_, help) \
bool variable##_enabled_ = default_;
#include "src/feature.def"
diff --git a/src/interp/interp.cc b/src/interp/interp.cc
index 5e6acb75..8793beb8 100644
--- a/src/interp/interp.cc
+++ b/src/interp/interp.cc
@@ -1018,23 +1018,6 @@ Result Thread::AtomicRmwCmpxchg(const uint8_t** pc) {
return Push<ResultValueType>(static_cast<ExtendedType>(read));
}
-// This function is used to clanp the bound for table.fill operations. This
-// can be removed once the behaviour of table.fill is updated to match the
-// new bulk meory semantics, which is to trap early on OOB.
-// See: https://github.com/webassembly/bulk-memory-operations/issues/111
-static bool ClampToBounds(uint32_t start, uint32_t* length, uint32_t max) {
- if (start > max) {
- *length = 0;
- return false;
- }
- uint32_t avail = max - start;
- if (*length > avail) {
- *length = avail;
- return false;
- }
- return true;
-}
-
static bool CheckBounds(uint32_t start, uint32_t length, uint32_t max) {
if (start > max) {
return false;
@@ -1144,15 +1127,16 @@ Result Thread::TableGet(const uint8_t** pc) {
Result Thread::TableFill(const uint8_t** pc) {
Table* table = ReadTable(pc);
- uint32_t table_size = table->size();
uint32_t size = Pop<uint32_t>();
Ref value = static_cast<Ref>(Pop<Ref>());
uint32_t dst = Pop<uint32_t>();
- bool ok = ClampToBounds(dst, &size, table_size);
+ bool ok = CheckBounds(dst, size, table->size());
+ if (!ok) {
+ TRAP_MSG(TableAccessOutOfBounds, "table.fill out of bounds");
+ }
for (uint32_t i = 0; i < size; i++) {
table->entries[dst+i] = value;
}
- TRAP_IF(!ok, TableAccessOutOfBounds);
return ResultType::Ok;
}
diff --git a/src/ir.h b/src/ir.h
index 5203c1c7..96aa15f1 100644
--- a/src/ir.h
+++ b/src/ir.h
@@ -1049,7 +1049,6 @@ enum class CommandType {
AssertUnlinkable,
AssertUninstantiable,
AssertReturn,
- AssertReturnFunc,
AssertTrap,
AssertExhaustion,
@@ -1105,12 +1104,6 @@ class AssertReturnCommand : public CommandMixin<CommandType::AssertReturn> {
ConstVector expected;
};
-class AssertReturnFuncCommand
- : public CommandMixin<CommandType::AssertReturnFunc> {
- public:
- ActionPtr action;
-};
-
template <CommandType TypeEnum>
class AssertTrapCommandBase : public CommandMixin<TypeEnum> {
public:
diff --git a/src/lexer-keywords.txt b/src/lexer-keywords.txt
index 3c839109..c5304aef 100644
--- a/src/lexer-keywords.txt
+++ b/src/lexer-keywords.txt
@@ -20,7 +20,6 @@ assert_exhaustion, TokenType::AssertExhaustion
assert_invalid, TokenType::AssertInvalid
assert_malformed, TokenType::AssertMalformed
assert_return, TokenType::AssertReturn
-assert_return_func, TokenType::AssertReturnFunc
assert_trap, TokenType::AssertTrap
assert_unlinkable, TokenType::AssertUnlinkable
atomic.notify, TokenType::AtomicNotify, Opcode::AtomicNotify
diff --git a/src/prebuilt/lexer-keywords.cc b/src/prebuilt/lexer-keywords.cc
index 758e4354..81e5b1bb 100644
--- a/src/prebuilt/lexer-keywords.cc
+++ b/src/prebuilt/lexer-keywords.cc
@@ -150,7 +150,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{
enum
{
- TOTAL_KEYWORDS = 528,
+ TOTAL_KEYWORDS = 527,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 26,
MIN_HASH_VALUE = 15,
@@ -161,1321 +161,1319 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 446 "src/lexer-keywords.txt"
+#line 445 "src/lexer-keywords.txt"
{"if", TokenType::If, Opcode::If},
-#line 126 "src/lexer-keywords.txt"
+#line 125 "src/lexer-keywords.txt"
{"f64", Type::F64},
-#line 461 "src/lexer-keywords.txt"
+#line 460 "src/lexer-keywords.txt"
{"mut", TokenType::Mut},
-#line 75 "src/lexer-keywords.txt"
+#line 74 "src/lexer-keywords.txt"
{"f32", Type::F32},
-#line 394 "src/lexer-keywords.txt"
+#line 393 "src/lexer-keywords.txt"
{"i64", Type::I64},
{""},
-#line 268 "src/lexer-keywords.txt"
+#line 267 "src/lexer-keywords.txt"
{"i32", Type::I32},
{""}, {""}, {""}, {""},
-#line 42 "src/lexer-keywords.txt"
+#line 41 "src/lexer-keywords.txt"
{"else", TokenType::Else, Opcode::Else},
{""},
-#line 41 "src/lexer-keywords.txt"
+#line 40 "src/lexer-keywords.txt"
{"elem", TokenType::Elem},
-#line 113 "src/lexer-keywords.txt"
+#line 112 "src/lexer-keywords.txt"
{"f64.lt", TokenType::Compare, Opcode::F64Lt},
-#line 63 "src/lexer-keywords.txt"
+#line 62 "src/lexer-keywords.txt"
{"f32.lt", TokenType::Compare, Opcode::F32Lt},
{""}, {""}, {""}, {""},
-#line 44 "src/lexer-keywords.txt"
+#line 43 "src/lexer-keywords.txt"
{"event", TokenType::Event},
-#line 490 "src/lexer-keywords.txt"
+#line 489 "src/lexer-keywords.txt"
{"then", TokenType::Then},
{""}, {""},
-#line 111 "src/lexer-keywords.txt"
+#line 110 "src/lexer-keywords.txt"
{"f64.le", TokenType::Compare, Opcode::F64Le},
-#line 61 "src/lexer-keywords.txt"
+#line 60 "src/lexer-keywords.txt"
{"f32.le", TokenType::Compare, Opcode::F32Le},
{""},
-#line 367 "src/lexer-keywords.txt"
+#line 366 "src/lexer-keywords.txt"
{"i64.lt_s", TokenType::Compare, Opcode::I64LtS},
-#line 242 "src/lexer-keywords.txt"
+#line 241 "src/lexer-keywords.txt"
{"i32.lt_s", TokenType::Compare, Opcode::I32LtS},
{""}, {""}, {""},
-#line 358 "src/lexer-keywords.txt"
+#line 357 "src/lexer-keywords.txt"
{"i64.le_s", TokenType::Compare, Opcode::I64LeS},
-#line 235 "src/lexer-keywords.txt"
+#line 234 "src/lexer-keywords.txt"
{"i32.le_s", TokenType::Compare, Opcode::I32LeS},
{""},
-#line 368 "src/lexer-keywords.txt"
+#line 367 "src/lexer-keywords.txt"
{"i64.lt_u", TokenType::Compare, Opcode::I64LtU},
-#line 243 "src/lexer-keywords.txt"
+#line 242 "src/lexer-keywords.txt"
{"i32.lt_u", TokenType::Compare, Opcode::I32LtU},
-#line 374 "src/lexer-keywords.txt"
+#line 373 "src/lexer-keywords.txt"
{"i64.rem_s", TokenType::Binary, Opcode::I64RemS},
-#line 249 "src/lexer-keywords.txt"
+#line 248 "src/lexer-keywords.txt"
{"i32.rem_s", TokenType::Binary, Opcode::I32RemS},
-#line 148 "src/lexer-keywords.txt"
+#line 147 "src/lexer-keywords.txt"
{"funcref", Type::Funcref},
-#line 359 "src/lexer-keywords.txt"
+#line 358 "src/lexer-keywords.txt"
{"i64.le_u", TokenType::Compare, Opcode::I64LeU},
-#line 236 "src/lexer-keywords.txt"
+#line 235 "src/lexer-keywords.txt"
{"i32.le_u", TokenType::Compare, Opcode::I32LeU},
-#line 489 "src/lexer-keywords.txt"
+#line 488 "src/lexer-keywords.txt"
{"table", TokenType::Table},
{""},
-#line 466 "src/lexer-keywords.txt"
+#line 465 "src/lexer-keywords.txt"
{"offset", TokenType::Offset},
-#line 375 "src/lexer-keywords.txt"
+#line 374 "src/lexer-keywords.txt"
{"i64.rem_u", TokenType::Binary, Opcode::I64RemU},
-#line 250 "src/lexer-keywords.txt"
+#line 249 "src/lexer-keywords.txt"
{"i32.rem_u", TokenType::Binary, Opcode::I32RemU},
-#line 460 "src/lexer-keywords.txt"
+#line 459 "src/lexer-keywords.txt"
{"module", TokenType::Module},
{""},
-#line 43 "src/lexer-keywords.txt"
+#line 42 "src/lexer-keywords.txt"
{"end", TokenType::End, Opcode::End},
-#line 479 "src/lexer-keywords.txt"
+#line 478 "src/lexer-keywords.txt"
{"select", TokenType::Select, Opcode::Select},
-#line 481 "src/lexer-keywords.txt"
+#line 480 "src/lexer-keywords.txt"
{"start", TokenType::Start},
{""},
-#line 119 "src/lexer-keywords.txt"
+#line 118 "src/lexer-keywords.txt"
{"f64.ne", TokenType::Compare, Opcode::F64Ne},
-#line 69 "src/lexer-keywords.txt"
+#line 68 "src/lexer-keywords.txt"
{"f32.ne", TokenType::Compare, Opcode::F32Ne},
-#line 465 "src/lexer-keywords.txt"
+#line 464 "src/lexer-keywords.txt"
{"nullref", Type::Nullref},
-#line 370 "src/lexer-keywords.txt"
+#line 369 "src/lexer-keywords.txt"
{"i64.ne", TokenType::Compare, Opcode::I64Ne},
-#line 245 "src/lexer-keywords.txt"
+#line 244 "src/lexer-keywords.txt"
{"i32.ne", TokenType::Compare, Opcode::I32Ne},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 38 "src/lexer-keywords.txt"
+#line 37 "src/lexer-keywords.txt"
{"data", TokenType::Data},
{""},
-#line 115 "src/lexer-keywords.txt"
+#line 114 "src/lexer-keywords.txt"
{"f64.min", TokenType::Binary, Opcode::F64Min},
-#line 65 "src/lexer-keywords.txt"
+#line 64 "src/lexer-keywords.txt"
{"f32.min", TokenType::Binary, Opcode::F32Min},
{""}, {""},
-#line 116 "src/lexer-keywords.txt"
+#line 115 "src/lexer-keywords.txt"
{"f64.mul", TokenType::Binary, Opcode::F64Mul},
-#line 66 "src/lexer-keywords.txt"
+#line 65 "src/lexer-keywords.txt"
{"f32.mul", TokenType::Binary, Opcode::F32Mul},
{""},
-#line 369 "src/lexer-keywords.txt"
+#line 368 "src/lexer-keywords.txt"
{"i64.mul", TokenType::Binary, Opcode::I64Mul},
-#line 244 "src/lexer-keywords.txt"
+#line 243 "src/lexer-keywords.txt"
{"i32.mul", TokenType::Binary, Opcode::I32Mul},
{""}, {""},
-#line 97 "src/lexer-keywords.txt"
+#line 96 "src/lexer-keywords.txt"
{"f64.abs", TokenType::Unary, Opcode::F64Abs},
-#line 46 "src/lexer-keywords.txt"
+#line 45 "src/lexer-keywords.txt"
{"f32.abs", TokenType::Unary, Opcode::F32Abs},
{""}, {""},
-#line 124 "src/lexer-keywords.txt"
+#line 123 "src/lexer-keywords.txt"
{"f64.sub", TokenType::Binary, Opcode::F64Sub},
-#line 73 "src/lexer-keywords.txt"
+#line 72 "src/lexer-keywords.txt"
{"f32.sub", TokenType::Binary, Opcode::F32Sub},
{""},
-#line 385 "src/lexer-keywords.txt"
+#line 384 "src/lexer-keywords.txt"
{"i64.sub", TokenType::Binary, Opcode::I64Sub},
-#line 259 "src/lexer-keywords.txt"
+#line 258 "src/lexer-keywords.txt"
{"i32.sub", TokenType::Binary, Opcode::I32Sub},
-#line 486 "src/lexer-keywords.txt"
+#line 485 "src/lexer-keywords.txt"
{"table.set", TokenType::TableSet, Opcode::TableSet},
-#line 99 "src/lexer-keywords.txt"
+#line 98 "src/lexer-keywords.txt"
{"f64.ceil", TokenType::Unary, Opcode::F64Ceil},
-#line 48 "src/lexer-keywords.txt"
+#line 47 "src/lexer-keywords.txt"
{"f32.ceil", TokenType::Unary, Opcode::F32Ceil},
-#line 28 "src/lexer-keywords.txt"
+#line 27 "src/lexer-keywords.txt"
{"block", TokenType::Block, Opcode::Block},
-#line 376 "src/lexer-keywords.txt"
+#line 375 "src/lexer-keywords.txt"
{"i64.rotl", TokenType::Binary, Opcode::I64Rotl},
-#line 251 "src/lexer-keywords.txt"
+#line 250 "src/lexer-keywords.txt"
{"i32.rotl", TokenType::Binary, Opcode::I32Rotl},
-#line 474 "src/lexer-keywords.txt"
+#line 473 "src/lexer-keywords.txt"
{"result", TokenType::Result},
{""}, {""},
-#line 100 "src/lexer-keywords.txt"
+#line 99 "src/lexer-keywords.txt"
{"f64.const", TokenType::Const, Opcode::F64Const},
-#line 49 "src/lexer-keywords.txt"
+#line 48 "src/lexer-keywords.txt"
{"f32.const", TokenType::Const, Opcode::F32Const},
-#line 480 "src/lexer-keywords.txt"
+#line 479 "src/lexer-keywords.txt"
{"shared", TokenType::Shared},
-#line 343 "src/lexer-keywords.txt"
+#line 342 "src/lexer-keywords.txt"
{"i64.const", TokenType::Const, Opcode::I64Const},
-#line 223 "src/lexer-keywords.txt"
+#line 222 "src/lexer-keywords.txt"
{"i32.const", TokenType::Const, Opcode::I32Const},
{""}, {""}, {""}, {""},
-#line 32 "src/lexer-keywords.txt"
+#line 31 "src/lexer-keywords.txt"
{"br", TokenType::Br, Opcode::Br},
-#line 485 "src/lexer-keywords.txt"
+#line 484 "src/lexer-keywords.txt"
{"table.init", TokenType::TableInit, Opcode::TableInit},
{""},
-#line 149 "src/lexer-keywords.txt"
+#line 148 "src/lexer-keywords.txt"
{"func", TokenType::Func},
{""},
-#line 304 "src/lexer-keywords.txt"
+#line 303 "src/lexer-keywords.txt"
{"i64.and", TokenType::Binary, Opcode::I64And},
-#line 193 "src/lexer-keywords.txt"
+#line 192 "src/lexer-keywords.txt"
{"i32.and", TokenType::Binary, Opcode::I32And},
{""}, {""},
-#line 98 "src/lexer-keywords.txt"
+#line 97 "src/lexer-keywords.txt"
{"f64.add", TokenType::Binary, Opcode::F64Add},
-#line 47 "src/lexer-keywords.txt"
+#line 46 "src/lexer-keywords.txt"
{"f32.add", TokenType::Binary, Opcode::F32Add},
{""},
-#line 303 "src/lexer-keywords.txt"
+#line 302 "src/lexer-keywords.txt"
{"i64.add", TokenType::Binary, Opcode::I64Add},
-#line 192 "src/lexer-keywords.txt"
+#line 191 "src/lexer-keywords.txt"
{"i32.add", TokenType::Binary, Opcode::I32Add},
{""}, {""},
-#line 478 "src/lexer-keywords.txt"
+#line 477 "src/lexer-keywords.txt"
{"return", TokenType::Return, Opcode::Return},
-#line 488 "src/lexer-keywords.txt"
+#line 487 "src/lexer-keywords.txt"
{"table.fill", TokenType::TableFill, Opcode::TableFill},
{""}, {""}, {""},
-#line 34 "src/lexer-keywords.txt"
+#line 33 "src/lexer-keywords.txt"
{"call", TokenType::Call, Opcode::Call},
{""}, {""},
-#line 147 "src/lexer-keywords.txt"
+#line 146 "src/lexer-keywords.txt"
{"f64x2", TokenType::F64X2},
{""}, {""},
-#line 409 "src/lexer-keywords.txt"
+#line 408 "src/lexer-keywords.txt"
{"i64x2", TokenType::I64X2},
-#line 452 "src/lexer-keywords.txt"
+#line 451 "src/lexer-keywords.txt"
{"local", TokenType::Local},
{""}, {""}, {""},
-#line 472 "src/lexer-keywords.txt"
+#line 471 "src/lexer-keywords.txt"
{"ref.host", TokenType::RefHost},
{""},
-#line 31 "src/lexer-keywords.txt"
+#line 30 "src/lexer-keywords.txt"
{"br_table", TokenType::BrTable, Opcode::BrTable},
{""},
-#line 112 "src/lexer-keywords.txt"
+#line 111 "src/lexer-keywords.txt"
{"f64.load", TokenType::Load, Opcode::F64Load},
-#line 62 "src/lexer-keywords.txt"
+#line 61 "src/lexer-keywords.txt"
{"f32.load", TokenType::Load, Opcode::F32Load},
-#line 503 "src/lexer-keywords.txt"
+#line 502 "src/lexer-keywords.txt"
{"v128", Type::V128},
-#line 366 "src/lexer-keywords.txt"
+#line 365 "src/lexer-keywords.txt"
{"i64.load", TokenType::Load, Opcode::I64Load},
-#line 241 "src/lexer-keywords.txt"
+#line 240 "src/lexer-keywords.txt"
{"i32.load", TokenType::Load, Opcode::I32Load},
{""}, {""},
-#line 123 "src/lexer-keywords.txt"
+#line 122 "src/lexer-keywords.txt"
{"f64.store", TokenType::Store, Opcode::F64Store},
-#line 72 "src/lexer-keywords.txt"
+#line 71 "src/lexer-keywords.txt"
{"f32.store", TokenType::Store, Opcode::F32Store},
{""},
-#line 384 "src/lexer-keywords.txt"
+#line 383 "src/lexer-keywords.txt"
{"i64.store", TokenType::Store, Opcode::I64Store},
-#line 258 "src/lexer-keywords.txt"
+#line 257 "src/lexer-keywords.txt"
{"i32.store", TokenType::Store, Opcode::I32Store},
{""},
-#line 382 "src/lexer-keywords.txt"
+#line 381 "src/lexer-keywords.txt"
{"i64.store32", TokenType::Store, Opcode::I64Store32},
-#line 364 "src/lexer-keywords.txt"
+#line 363 "src/lexer-keywords.txt"
{"i64.load8_s", TokenType::Load, Opcode::I64Load8S},
-#line 239 "src/lexer-keywords.txt"
+#line 238 "src/lexer-keywords.txt"
{"i32.load8_s", TokenType::Load, Opcode::I32Load8S},
{""},
-#line 345 "src/lexer-keywords.txt"
+#line 344 "src/lexer-keywords.txt"
{"i64.div_s", TokenType::Binary, Opcode::I64DivS},
-#line 225 "src/lexer-keywords.txt"
+#line 224 "src/lexer-keywords.txt"
{"i32.div_s", TokenType::Binary, Opcode::I32DivS},
{""},
-#line 448 "src/lexer-keywords.txt"
+#line 447 "src/lexer-keywords.txt"
{"invoke", TokenType::Invoke},
{""},
-#line 365 "src/lexer-keywords.txt"
+#line 364 "src/lexer-keywords.txt"
{"i64.load8_u", TokenType::Load, Opcode::I64Load8U},
-#line 240 "src/lexer-keywords.txt"
+#line 239 "src/lexer-keywords.txt"
{"i32.load8_u", TokenType::Load, Opcode::I32Load8U},
-#line 450 "src/lexer-keywords.txt"
+#line 449 "src/lexer-keywords.txt"
{"local.set", TokenType::LocalSet, Opcode::LocalSet},
-#line 346 "src/lexer-keywords.txt"
+#line 345 "src/lexer-keywords.txt"
{"i64.div_u", TokenType::Binary, Opcode::I64DivU},
-#line 226 "src/lexer-keywords.txt"
+#line 225 "src/lexer-keywords.txt"
{"i32.div_u", TokenType::Binary, Opcode::I32DivU},
{""},
-#line 383 "src/lexer-keywords.txt"
+#line 382 "src/lexer-keywords.txt"
{"i64.store8", TokenType::Store, Opcode::I64Store8},
-#line 257 "src/lexer-keywords.txt"
+#line 256 "src/lexer-keywords.txt"
{"i32.store8", TokenType::Store, Opcode::I32Store8},
{""},
-#line 487 "src/lexer-keywords.txt"
+#line 486 "src/lexer-keywords.txt"
{"table.size", TokenType::TableSize, Opcode::TableSize},
{""}, {""},
-#line 451 "src/lexer-keywords.txt"
+#line 450 "src/lexer-keywords.txt"
{"local.tee", TokenType::LocalTee, Opcode::LocalTee},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 137 "src/lexer-keywords.txt"
+#line 136 "src/lexer-keywords.txt"
{"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt},
{""}, {""}, {""},
-#line 471 "src/lexer-keywords.txt"
+#line 470 "src/lexer-keywords.txt"
{"ref.null", TokenType::RefNull, Opcode::RefNull},
{""},
-#line 340 "src/lexer-keywords.txt"
+#line 339 "src/lexer-keywords.txt"
{"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore},
-#line 220 "src/lexer-keywords.txt"
+#line 219 "src/lexer-keywords.txt"
{"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore},
-#line 142 "src/lexer-keywords.txt"
+#line 141 "src/lexer-keywords.txt"
{"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne},
{""},
-#line 136 "src/lexer-keywords.txt"
+#line 135 "src/lexer-keywords.txt"
{"f64x2.le", TokenType::Compare, Opcode::F64X2Le},
-#line 117 "src/lexer-keywords.txt"
+#line 116 "src/lexer-keywords.txt"
{"f64.nearest", TokenType::Unary, Opcode::F64Nearest},
-#line 67 "src/lexer-keywords.txt"
+#line 66 "src/lexer-keywords.txt"
{"f32.nearest", TokenType::Unary, Opcode::F32Nearest},
-#line 338 "src/lexer-keywords.txt"
+#line 337 "src/lexer-keywords.txt"
{"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32},
{""}, {""}, {""}, {""}, {""},
-#line 344 "src/lexer-keywords.txt"
+#line 343 "src/lexer-keywords.txt"
{"i64.ctz", TokenType::Unary, Opcode::I64Ctz},
-#line 224 "src/lexer-keywords.txt"
+#line 223 "src/lexer-keywords.txt"
{"i32.ctz", TokenType::Unary, Opcode::I32Ctz},
-#line 475 "src/lexer-keywords.txt"
+#line 474 "src/lexer-keywords.txt"
{"rethrow", TokenType::Rethrow, Opcode::Rethrow},
{""},
-#line 25 "src/lexer-keywords.txt"
+#line 24 "src/lexer-keywords.txt"
{"assert_unlinkable", TokenType::AssertUnlinkable},
-#line 139 "src/lexer-keywords.txt"
+#line 138 "src/lexer-keywords.txt"
{"f64x2.min", TokenType::Binary, Opcode::F64X2Min},
-#line 470 "src/lexer-keywords.txt"
+#line 469 "src/lexer-keywords.txt"
{"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull},
{""}, {""},
-#line 140 "src/lexer-keywords.txt"
+#line 139 "src/lexer-keywords.txt"
{"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul},
{""},
#line 20 "src/lexer-keywords.txt"
{"assert_invalid", TokenType::AssertInvalid},
-#line 377 "src/lexer-keywords.txt"
+#line 376 "src/lexer-keywords.txt"
{"i64.rotr", TokenType::Binary, Opcode::I64Rotr},
-#line 252 "src/lexer-keywords.txt"
+#line 251 "src/lexer-keywords.txt"
{"i32.rotr", TokenType::Binary, Opcode::I32Rotr},
{""}, {""}, {""},
-#line 342 "src/lexer-keywords.txt"
+#line 341 "src/lexer-keywords.txt"
{"i64.clz", TokenType::Unary, Opcode::I64Clz},
-#line 222 "src/lexer-keywords.txt"
+#line 221 "src/lexer-keywords.txt"
{"i32.clz", TokenType::Unary, Opcode::I32Clz},
{""}, {""}, {""},
-#line 545 "src/lexer-keywords.txt"
+#line 544 "src/lexer-keywords.txt"
{"set_local", TokenType::LocalSet, Opcode::LocalSet},
{""}, {""},
-#line 341 "src/lexer-keywords.txt"
+#line 340 "src/lexer-keywords.txt"
{"i64.atomic.wait", TokenType::AtomicWait, Opcode::I64AtomicWait},
-#line 221 "src/lexer-keywords.txt"
+#line 220 "src/lexer-keywords.txt"
{"i32.atomic.wait", TokenType::AtomicWait, Opcode::I32AtomicWait},
-#line 546 "src/lexer-keywords.txt"
+#line 545 "src/lexer-keywords.txt"
{"tee_local", TokenType::LocalTee, Opcode::LocalTee},
{""}, {""}, {""}, {""}, {""},
-#line 146 "src/lexer-keywords.txt"
+#line 145 "src/lexer-keywords.txt"
{"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub},
{""}, {""},
-#line 408 "src/lexer-keywords.txt"
+#line 407 "src/lexer-keywords.txt"
{"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub},
{""}, {""}, {""},
-#line 127 "src/lexer-keywords.txt"
+#line 126 "src/lexer-keywords.txt"
{"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 55 "src/lexer-keywords.txt"
+#line 54 "src/lexer-keywords.txt"
{"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64},
{""}, {""},
-#line 308 "src/lexer-keywords.txt"
+#line 307 "src/lexer-keywords.txt"
{"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad},
-#line 196 "src/lexer-keywords.txt"
+#line 195 "src/lexer-keywords.txt"
{"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad},
{""},
-#line 362 "src/lexer-keywords.txt"
+#line 361 "src/lexer-keywords.txt"
{"i64.load32_s", TokenType::Load, Opcode::I64Load32S},
{""}, {""}, {""}, {""},
-#line 106 "src/lexer-keywords.txt"
+#line 105 "src/lexer-keywords.txt"
{"f64.div", TokenType::Binary, Opcode::F64Div},
-#line 56 "src/lexer-keywords.txt"
+#line 55 "src/lexer-keywords.txt"
{"f32.div", TokenType::Binary, Opcode::F32Div},
-#line 500 "src/lexer-keywords.txt"
+#line 499 "src/lexer-keywords.txt"
{"v128.not", TokenType::Unary, Opcode::V128Not},
-#line 363 "src/lexer-keywords.txt"
+#line 362 "src/lexer-keywords.txt"
{"i64.load32_u", TokenType::Load, Opcode::I64Load32U},
-#line 360 "src/lexer-keywords.txt"
+#line 359 "src/lexer-keywords.txt"
{"i64.load16_s", TokenType::Load, Opcode::I64Load16S},
-#line 237 "src/lexer-keywords.txt"
+#line 236 "src/lexer-keywords.txt"
{"i32.load16_s", TokenType::Load, Opcode::I32Load16S},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 361 "src/lexer-keywords.txt"
+#line 360 "src/lexer-keywords.txt"
{"i64.load16_u", TokenType::Load, Opcode::I64Load16U},
-#line 238 "src/lexer-keywords.txt"
+#line 237 "src/lexer-keywords.txt"
{"i32.load16_u", TokenType::Load, Opcode::I32Load16U},
{""}, {""},
-#line 128 "src/lexer-keywords.txt"
+#line 127 "src/lexer-keywords.txt"
{"f64x2.add", TokenType::Binary, Opcode::F64X2Add},
{""},
#line 22 "src/lexer-keywords.txt"
{"assert_return", TokenType::AssertReturn},
-#line 395 "src/lexer-keywords.txt"
+#line 394 "src/lexer-keywords.txt"
{"i64x2.add", TokenType::Binary, Opcode::I64X2Add},
{""},
-#line 307 "src/lexer-keywords.txt"
+#line 306 "src/lexer-keywords.txt"
{"i64.atomic.load8_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad8U},
-#line 195 "src/lexer-keywords.txt"
+#line 194 "src/lexer-keywords.txt"
{"i32.atomic.load8_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad8U},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 477 "src/lexer-keywords.txt"
+#line 476 "src/lexer-keywords.txt"
{"return_call", TokenType::ReturnCall, Opcode::ReturnCall},
{""}, {""},
#line 21 "src/lexer-keywords.txt"
{"assert_malformed", TokenType::AssertMalformed},
-#line 33 "src/lexer-keywords.txt"
+#line 32 "src/lexer-keywords.txt"
{"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 125 "src/lexer-keywords.txt"
+#line 124 "src/lexer-keywords.txt"
{"f64.trunc", TokenType::Unary, Opcode::F64Trunc},
-#line 74 "src/lexer-keywords.txt"
+#line 73 "src/lexer-keywords.txt"
{"f32.trunc", TokenType::Unary, Opcode::F32Trunc},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 495 "src/lexer-keywords.txt"
+#line 494 "src/lexer-keywords.txt"
{"v128.and", TokenType::Binary, Opcode::V128And},
{""}, {""}, {""},
-#line 496 "src/lexer-keywords.txt"
+#line 495 "src/lexer-keywords.txt"
{"v128.andnot", TokenType::Binary, Opcode::V128Andnot},
{""}, {""}, {""}, {""}, {""},
-#line 150 "src/lexer-keywords.txt"
+#line 149 "src/lexer-keywords.txt"
{"get", TokenType::Get},
-#line 513 "src/lexer-keywords.txt"
+#line 512 "src/lexer-keywords.txt"
{"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 502 "src/lexer-keywords.txt"
+#line 501 "src/lexer-keywords.txt"
{"v128.store", TokenType::Store, Opcode::V128Store},
{""},
-#line 468 "src/lexer-keywords.txt"
+#line 467 "src/lexer-keywords.txt"
{"quote", TokenType::Quote},
{""}, {""}, {""}, {""}, {""},
-#line 327 "src/lexer-keywords.txt"
+#line 326 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU},
-#line 208 "src/lexer-keywords.txt"
+#line 207 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 499 "src/lexer-keywords.txt"
+#line 498 "src/lexer-keywords.txt"
{"v128.load", TokenType::Load, Opcode::V128Load},
{""}, {""}, {""},
-#line 498 "src/lexer-keywords.txt"
+#line 497 "src/lexer-keywords.txt"
{"v128.const", TokenType::Const, Opcode::V128Const},
-#line 463 "src/lexer-keywords.txt"
+#line 462 "src/lexer-keywords.txt"
{"nan:canonical", TokenType::NanCanonical},
{""},
-#line 396 "src/lexer-keywords.txt"
+#line 395 "src/lexer-keywords.txt"
{"i64x2.all_true", TokenType::Unary, Opcode::I64X2AllTrue},
{""},
-#line 29 "src/lexer-keywords.txt"
+#line 28 "src/lexer-keywords.txt"
{"br_if", TokenType::BrIf, Opcode::BrIf},
-#line 386 "src/lexer-keywords.txt"
+#line 385 "src/lexer-keywords.txt"
{"i64.trunc_f32_s", TokenType::Convert, Opcode::I64TruncF32S},
-#line 260 "src/lexer-keywords.txt"
+#line 259 "src/lexer-keywords.txt"
{"i32.trunc_f32_s", TokenType::Convert, Opcode::I32TruncF32S},
-#line 330 "src/lexer-keywords.txt"
+#line 329 "src/lexer-keywords.txt"
{"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd},
-#line 211 "src/lexer-keywords.txt"
+#line 210 "src/lexer-keywords.txt"
{"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd},
-#line 387 "src/lexer-keywords.txt"
+#line 386 "src/lexer-keywords.txt"
{"i64.trunc_f32_u", TokenType::Convert, Opcode::I64TruncF32U},
-#line 261 "src/lexer-keywords.txt"
+#line 260 "src/lexer-keywords.txt"
{"i32.trunc_f32_u", TokenType::Convert, Opcode::I32TruncF32U},
{""},
-#line 320 "src/lexer-keywords.txt"
+#line 319 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU},
-#line 101 "src/lexer-keywords.txt"
+#line 100 "src/lexer-keywords.txt"
{"f64.convert_i32_s", TokenType::Convert, Opcode::F64ConvertI32S},
-#line 50 "src/lexer-keywords.txt"
+#line 49 "src/lexer-keywords.txt"
{"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S},
{""}, {""}, {""}, {""},
-#line 324 "src/lexer-keywords.txt"
+#line 323 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AndU},
-#line 205 "src/lexer-keywords.txt"
+#line 204 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AndU},
{""},
-#line 333 "src/lexer-keywords.txt"
+#line 332 "src/lexer-keywords.txt"
{"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr},
-#line 214 "src/lexer-keywords.txt"
+#line 213 "src/lexer-keywords.txt"
{"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr},
{""}, {""},
-#line 323 "src/lexer-keywords.txt"
+#line 322 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AddU},
-#line 204 "src/lexer-keywords.txt"
+#line 203 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AddU},
{""},
-#line 497 "src/lexer-keywords.txt"
+#line 496 "src/lexer-keywords.txt"
{"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect},
{""}, {""}, {""},
-#line 331 "src/lexer-keywords.txt"
+#line 330 "src/lexer-keywords.txt"
{"i64.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I64AtomicRmwAnd},
-#line 212 "src/lexer-keywords.txt"
+#line 211 "src/lexer-keywords.txt"
{"i32.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I32AtomicRmwAnd},
{""}, {""}, {""},
-#line 122 "src/lexer-keywords.txt"
+#line 121 "src/lexer-keywords.txt"
{"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt},
-#line 71 "src/lexer-keywords.txt"
+#line 70 "src/lexer-keywords.txt"
{"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt},
{""},
-#line 501 "src/lexer-keywords.txt"
+#line 500 "src/lexer-keywords.txt"
{"v128.or", TokenType::Binary, Opcode::V128Or},
-#line 388 "src/lexer-keywords.txt"
+#line 387 "src/lexer-keywords.txt"
{"i64.trunc_f64_s", TokenType::Convert, Opcode::I64TruncF64S},
-#line 262 "src/lexer-keywords.txt"
+#line 261 "src/lexer-keywords.txt"
{"i32.trunc_f64_s", TokenType::Convert, Opcode::I32TruncF64S},
{""}, {""},
-#line 389 "src/lexer-keywords.txt"
+#line 388 "src/lexer-keywords.txt"
{"i64.trunc_f64_u", TokenType::Convert, Opcode::I64TruncF64U},
-#line 263 "src/lexer-keywords.txt"
+#line 262 "src/lexer-keywords.txt"
{"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U},
{""},
-#line 493 "src/lexer-keywords.txt"
+#line 492 "src/lexer-keywords.txt"
{"type", TokenType::Type},
{""},
-#line 103 "src/lexer-keywords.txt"
+#line 102 "src/lexer-keywords.txt"
{"f64.convert_i64_s", TokenType::Convert, Opcode::F64ConvertI64S},
-#line 52 "src/lexer-keywords.txt"
+#line 51 "src/lexer-keywords.txt"
{"f32.convert_i64_s", TokenType::Convert, Opcode::F32ConvertI64S},
-#line 483 "src/lexer-keywords.txt"
+#line 482 "src/lexer-keywords.txt"
{"table.get", TokenType::TableGet, Opcode::TableGet},
{""}, {""}, {""}, {""},
-#line 447 "src/lexer-keywords.txt"
+#line 446 "src/lexer-keywords.txt"
{"import", TokenType::Import},
-#line 45 "src/lexer-keywords.txt"
+#line 44 "src/lexer-keywords.txt"
{"export", TokenType::Export},
{""}, {""}, {""}, {""},
-#line 317 "src/lexer-keywords.txt"
+#line 316 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AndU},
{""}, {""}, {""},
-#line 476 "src/lexer-keywords.txt"
+#line 475 "src/lexer-keywords.txt"
{"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect},
{""}, {""},
-#line 316 "src/lexer-keywords.txt"
+#line 315 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AddU},
-#line 131 "src/lexer-keywords.txt"
+#line 130 "src/lexer-keywords.txt"
{"f64x2.div", TokenType::Binary, Opcode::F64X2Div},
-#line 153 "src/lexer-keywords.txt"
+#line 152 "src/lexer-keywords.txt"
{"global", TokenType::Global},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 536 "src/lexer-keywords.txt"
+#line 535 "src/lexer-keywords.txt"
{"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S},
-#line 524 "src/lexer-keywords.txt"
+#line 523 "src/lexer-keywords.txt"
{"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S},
{""}, {""},
-#line 540 "src/lexer-keywords.txt"
+#line 539 "src/lexer-keywords.txt"
{"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U},
-#line 528 "src/lexer-keywords.txt"
+#line 527 "src/lexer-keywords.txt"
{"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U},
{""}, {""},
-#line 96 "src/lexer-keywords.txt"
+#line 95 "src/lexer-keywords.txt"
{"f32x4", TokenType::F32X4},
-#line 453 "src/lexer-keywords.txt"
+#line 452 "src/lexer-keywords.txt"
{"loop", TokenType::Loop, Opcode::Loop},
{""},
-#line 295 "src/lexer-keywords.txt"
+#line 294 "src/lexer-keywords.txt"
{"i32x4", TokenType::I32X4},
-#line 334 "src/lexer-keywords.txt"
+#line 333 "src/lexer-keywords.txt"
{"i64.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I64AtomicRmwSub},
-#line 215 "src/lexer-keywords.txt"
+#line 214 "src/lexer-keywords.txt"
{"i32.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I32AtomicRmwSub},
-#line 39 "src/lexer-keywords.txt"
+#line 38 "src/lexer-keywords.txt"
{"drop", TokenType::Drop, Opcode::Drop},
{""}, {""}, {""},
-#line 152 "src/lexer-keywords.txt"
+#line 151 "src/lexer-keywords.txt"
{"global.set", TokenType::GlobalSet, Opcode::GlobalSet},
{""}, {""},
-#line 318 "src/lexer-keywords.txt"
+#line 317 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw32CmpxchgU},
{""},
-#line 381 "src/lexer-keywords.txt"
+#line 380 "src/lexer-keywords.txt"
{"i64.store16", TokenType::Store, Opcode::I64Store16},
-#line 256 "src/lexer-keywords.txt"
+#line 255 "src/lexer-keywords.txt"
{"i32.store16", TokenType::Store, Opcode::I32Store16},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 319 "src/lexer-keywords.txt"
+#line 318 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32OrU},
-#line 348 "src/lexer-keywords.txt"
+#line 347 "src/lexer-keywords.txt"
{"i64.eqz", TokenType::Convert, Opcode::I64Eqz},
-#line 228 "src/lexer-keywords.txt"
+#line 227 "src/lexer-keywords.txt"
{"i32.eqz", TokenType::Convert, Opcode::I32Eqz},
-#line 537 "src/lexer-keywords.txt"
+#line 536 "src/lexer-keywords.txt"
{"i64.trunc_s/f64", TokenType::Convert, Opcode::I64TruncF64S},
-#line 525 "src/lexer-keywords.txt"
+#line 524 "src/lexer-keywords.txt"
{"i32.trunc_s/f64", TokenType::Convert, Opcode::I32TruncF64S},
{""}, {""},
-#line 541 "src/lexer-keywords.txt"
+#line 540 "src/lexer-keywords.txt"
{"i64.trunc_u/f64", TokenType::Convert, Opcode::I64TruncF64U},
-#line 529 "src/lexer-keywords.txt"
+#line 528 "src/lexer-keywords.txt"
{"i32.trunc_u/f64", TokenType::Convert, Opcode::I32TruncF64U},
{""}, {""}, {""}, {""}, {""},
-#line 449 "src/lexer-keywords.txt"
+#line 448 "src/lexer-keywords.txt"
{"local.get", TokenType::LocalGet, Opcode::LocalGet},
{""},
-#line 135 "src/lexer-keywords.txt"
+#line 134 "src/lexer-keywords.txt"
{"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt},
{""},
-#line 102 "src/lexer-keywords.txt"
+#line 101 "src/lexer-keywords.txt"
{"f64.convert_i32_u", TokenType::Convert, Opcode::F64ConvertI32U},
-#line 51 "src/lexer-keywords.txt"
+#line 50 "src/lexer-keywords.txt"
{"f32.convert_i32_u", TokenType::Convert, Opcode::F32ConvertI32U},
{""}, {""},
-#line 306 "src/lexer-keywords.txt"
+#line 305 "src/lexer-keywords.txt"
{"i64.atomic.load32_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad32U},
-#line 23 "src/lexer-keywords.txt"
- {"assert_return_func", TokenType::AssertReturnFunc},
- {""}, {""},
-#line 134 "src/lexer-keywords.txt"
+ {""}, {""}, {""},
+#line 133 "src/lexer-keywords.txt"
{"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge},
{""},
-#line 467 "src/lexer-keywords.txt"
+#line 466 "src/lexer-keywords.txt"
{"param", TokenType::Param},
{""},
-#line 86 "src/lexer-keywords.txt"
+#line 85 "src/lexer-keywords.txt"
{"f32x4.lt", TokenType::Compare, Opcode::F32X4Lt},
{""}, {""},
-#line 337 "src/lexer-keywords.txt"
+#line 336 "src/lexer-keywords.txt"
{"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16},
-#line 218 "src/lexer-keywords.txt"
+#line 217 "src/lexer-keywords.txt"
{"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16},
{""}, {""}, {""},
-#line 91 "src/lexer-keywords.txt"
+#line 90 "src/lexer-keywords.txt"
{"f32x4.ne", TokenType::Compare, Opcode::F32X4Ne},
-#line 284 "src/lexer-keywords.txt"
+#line 283 "src/lexer-keywords.txt"
{"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS},
-#line 85 "src/lexer-keywords.txt"
+#line 84 "src/lexer-keywords.txt"
{"f32x4.le", TokenType::Compare, Opcode::F32X4Le},
-#line 288 "src/lexer-keywords.txt"
+#line 287 "src/lexer-keywords.txt"
{"i32x4.ne", TokenType::Compare, Opcode::I32X4Ne},
{""},
-#line 285 "src/lexer-keywords.txt"
+#line 284 "src/lexer-keywords.txt"
{"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU},
-#line 279 "src/lexer-keywords.txt"
+#line 278 "src/lexer-keywords.txt"
{"i32x4.le_s", TokenType::Compare, Opcode::I32X4LeS},
-#line 351 "src/lexer-keywords.txt"
+#line 350 "src/lexer-keywords.txt"
{"i64.extend8_s", TokenType::Unary, Opcode::I64Extend8S},
-#line 230 "src/lexer-keywords.txt"
+#line 229 "src/lexer-keywords.txt"
{"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S},
{""},
-#line 280 "src/lexer-keywords.txt"
+#line 279 "src/lexer-keywords.txt"
{"i32x4.le_u", TokenType::Compare, Opcode::I32X4LeU},
{""}, {""}, {""},
-#line 313 "src/lexer-keywords.txt"
+#line 312 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU},
-#line 201 "src/lexer-keywords.txt"
+#line 200 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU},
-#line 88 "src/lexer-keywords.txt"
+#line 87 "src/lexer-keywords.txt"
{"f32x4.min", TokenType::Binary, Opcode::F32X4Min},
{""},
-#line 104 "src/lexer-keywords.txt"
+#line 103 "src/lexer-keywords.txt"
{"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U},
-#line 53 "src/lexer-keywords.txt"
+#line 52 "src/lexer-keywords.txt"
{"f32.convert_i64_u", TokenType::Convert, Opcode::F32ConvertI64U},
-#line 89 "src/lexer-keywords.txt"
+#line 88 "src/lexer-keywords.txt"
{"f32x4.mul", TokenType::Binary, Opcode::F32X4Mul},
{""}, {""},
-#line 286 "src/lexer-keywords.txt"
+#line 285 "src/lexer-keywords.txt"
{"i32x4.mul", TokenType::Binary, Opcode::I32X4Mul},
{""}, {""},
-#line 305 "src/lexer-keywords.txt"
+#line 304 "src/lexer-keywords.txt"
{"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U},
-#line 194 "src/lexer-keywords.txt"
+#line 193 "src/lexer-keywords.txt"
{"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U},
{""},
-#line 390 "src/lexer-keywords.txt"
+#line 389 "src/lexer-keywords.txt"
{"i64.trunc_sat_f32_s", TokenType::Convert, Opcode::I64TruncSatF32S},
-#line 264 "src/lexer-keywords.txt"
+#line 263 "src/lexer-keywords.txt"
{"i32.trunc_sat_f32_s", TokenType::Convert, Opcode::I32TruncSatF32S},
{""}, {""},
-#line 145 "src/lexer-keywords.txt"
+#line 144 "src/lexer-keywords.txt"
{"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt},
{""}, {""},
-#line 522 "src/lexer-keywords.txt"
+#line 521 "src/lexer-keywords.txt"
{"get_local", TokenType::LocalGet, Opcode::LocalGet},
-#line 391 "src/lexer-keywords.txt"
+#line 390 "src/lexer-keywords.txt"
{"i64.trunc_sat_f32_u", TokenType::Convert, Opcode::I64TruncSatF32U},
-#line 265 "src/lexer-keywords.txt"
+#line 264 "src/lexer-keywords.txt"
{"i32.trunc_sat_f32_u", TokenType::Convert, Opcode::I32TruncSatF32U},
{""},
-#line 30 "src/lexer-keywords.txt"
+#line 29 "src/lexer-keywords.txt"
{"br_on_exn", TokenType::BrOnExn, Opcode::BrOnExn},
{""},
-#line 491 "src/lexer-keywords.txt"
+#line 490 "src/lexer-keywords.txt"
{"throw", TokenType::Throw, Opcode::Throw},
-#line 484 "src/lexer-keywords.txt"
+#line 483 "src/lexer-keywords.txt"
{"table.grow", TokenType::TableGrow, Opcode::TableGrow},
-#line 95 "src/lexer-keywords.txt"
+#line 94 "src/lexer-keywords.txt"
{"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub},
{""}, {""},
-#line 294 "src/lexer-keywords.txt"
+#line 293 "src/lexer-keywords.txt"
{"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub},
{""}, {""}, {""},
-#line 76 "src/lexer-keywords.txt"
+#line 75 "src/lexer-keywords.txt"
{"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs},
{""},
-#line 515 "src/lexer-keywords.txt"
+#line 514 "src/lexer-keywords.txt"
{"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S},
-#line 509 "src/lexer-keywords.txt"
+#line 508 "src/lexer-keywords.txt"
{"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S},
{""}, {""},
-#line 517 "src/lexer-keywords.txt"
+#line 516 "src/lexer-keywords.txt"
{"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U},
-#line 511 "src/lexer-keywords.txt"
+#line 510 "src/lexer-keywords.txt"
{"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U},
{""}, {""},
-#line 371 "src/lexer-keywords.txt"
+#line 370 "src/lexer-keywords.txt"
{"i64.or", TokenType::Binary, Opcode::I64Or},
-#line 246 "src/lexer-keywords.txt"
+#line 245 "src/lexer-keywords.txt"
{"i32.or", TokenType::Binary, Opcode::I32Or},
{""}, {""}, {""},
-#line 310 "src/lexer-keywords.txt"
+#line 309 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AndU},
-#line 198 "src/lexer-keywords.txt"
+#line 197 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AndU},
{""}, {""}, {""}, {""}, {""},
-#line 309 "src/lexer-keywords.txt"
+#line 308 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU},
-#line 197 "src/lexer-keywords.txt"
+#line 196 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AddU},
-#line 473 "src/lexer-keywords.txt"
+#line 472 "src/lexer-keywords.txt"
{"register", TokenType::Register},
-#line 108 "src/lexer-keywords.txt"
+#line 107 "src/lexer-keywords.txt"
{"f64.floor", TokenType::Unary, Opcode::F64Floor},
-#line 58 "src/lexer-keywords.txt"
+#line 57 "src/lexer-keywords.txt"
{"f32.floor", TokenType::Unary, Opcode::F32Floor},
{""}, {""},
-#line 533 "src/lexer-keywords.txt"
+#line 532 "src/lexer-keywords.txt"
{"i64.extend_s/i32", TokenType::Convert, Opcode::I64ExtendI32S},
{""},
-#line 144 "src/lexer-keywords.txt"
+#line 143 "src/lexer-keywords.txt"
{"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat},
{""},
-#line 534 "src/lexer-keywords.txt"
+#line 533 "src/lexer-keywords.txt"
{"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U},
-#line 407 "src/lexer-keywords.txt"
+#line 406 "src/lexer-keywords.txt"
{"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat},
{""},
-#line 77 "src/lexer-keywords.txt"
+#line 76 "src/lexer-keywords.txt"
{"f32x4.add", TokenType::Binary, Opcode::F32X4Add},
{""}, {""},
-#line 270 "src/lexer-keywords.txt"
+#line 269 "src/lexer-keywords.txt"
{"i32x4.add", TokenType::Binary, Opcode::I32X4Add},
{""}, {""},
-#line 107 "src/lexer-keywords.txt"
+#line 106 "src/lexer-keywords.txt"
{"f64.eq", TokenType::Compare, Opcode::F64Eq},
-#line 57 "src/lexer-keywords.txt"
+#line 56 "src/lexer-keywords.txt"
{"f32.eq", TokenType::Compare, Opcode::F32Eq},
{""},
-#line 347 "src/lexer-keywords.txt"
+#line 346 "src/lexer-keywords.txt"
{"i64.eq", TokenType::Compare, Opcode::I64Eq},
-#line 227 "src/lexer-keywords.txt"
+#line 226 "src/lexer-keywords.txt"
{"i32.eq", TokenType::Compare, Opcode::I32Eq},
{""}, {""}, {""},
-#line 120 "src/lexer-keywords.txt"
+#line 119 "src/lexer-keywords.txt"
{"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32},
{""}, {""}, {""}, {""},
-#line 311 "src/lexer-keywords.txt"
+#line 310 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw16CmpxchgU},
-#line 199 "src/lexer-keywords.txt"
+#line 198 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw16CmpxchgU},
{""}, {""}, {""},
-#line 350 "src/lexer-keywords.txt"
+#line 349 "src/lexer-keywords.txt"
{"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S},
-#line 469 "src/lexer-keywords.txt"
+#line 468 "src/lexer-keywords.txt"
{"ref.func", TokenType::RefFunc, Opcode::RefFunc},
-#line 110 "src/lexer-keywords.txt"
+#line 109 "src/lexer-keywords.txt"
{"f64.gt", TokenType::Compare, Opcode::F64Gt},
-#line 60 "src/lexer-keywords.txt"
+#line 59 "src/lexer-keywords.txt"
{"f32.gt", TokenType::Compare, Opcode::F32Gt},
{""}, {""}, {""}, {""},
-#line 312 "src/lexer-keywords.txt"
+#line 311 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU},
-#line 200 "src/lexer-keywords.txt"
+#line 199 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU},
-#line 352 "src/lexer-keywords.txt"
+#line 351 "src/lexer-keywords.txt"
{"i64.extend_i32_s", TokenType::Convert, Opcode::I64ExtendI32S},
{""},
-#line 109 "src/lexer-keywords.txt"
+#line 108 "src/lexer-keywords.txt"
{"f64.ge", TokenType::Compare, Opcode::F64Ge},
-#line 59 "src/lexer-keywords.txt"
+#line 58 "src/lexer-keywords.txt"
{"f32.ge", TokenType::Compare, Opcode::F32Ge},
{""},
-#line 356 "src/lexer-keywords.txt"
+#line 355 "src/lexer-keywords.txt"
{"i64.gt_s", TokenType::Compare, Opcode::I64GtS},
-#line 233 "src/lexer-keywords.txt"
+#line 232 "src/lexer-keywords.txt"
{"i32.gt_s", TokenType::Compare, Opcode::I32GtS},
{""},
-#line 353 "src/lexer-keywords.txt"
+#line 352 "src/lexer-keywords.txt"
{"i64.extend_i32_u", TokenType::Convert, Opcode::I64ExtendI32U},
{""},
-#line 354 "src/lexer-keywords.txt"
+#line 353 "src/lexer-keywords.txt"
{"i64.ge_s", TokenType::Compare, Opcode::I64GeS},
-#line 231 "src/lexer-keywords.txt"
+#line 230 "src/lexer-keywords.txt"
{"i32.ge_s", TokenType::Compare, Opcode::I32GeS},
{""},
-#line 357 "src/lexer-keywords.txt"
+#line 356 "src/lexer-keywords.txt"
{"i64.gt_u", TokenType::Compare, Opcode::I64GtU},
-#line 234 "src/lexer-keywords.txt"
+#line 233 "src/lexer-keywords.txt"
{"i32.gt_u", TokenType::Compare, Opcode::I32GtU},
{""}, {""},
-#line 191 "src/lexer-keywords.txt"
+#line 190 "src/lexer-keywords.txt"
{"i16x8", TokenType::I16X8},
-#line 355 "src/lexer-keywords.txt"
+#line 354 "src/lexer-keywords.txt"
{"i64.ge_u", TokenType::Compare, Opcode::I64GeU},
-#line 232 "src/lexer-keywords.txt"
+#line 231 "src/lexer-keywords.txt"
{"i32.ge_u", TokenType::Compare, Opcode::I32GeU},
{""}, {""},
-#line 430 "src/lexer-keywords.txt"
+#line 429 "src/lexer-keywords.txt"
{"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS},
#line 19 "src/lexer-keywords.txt"
{"assert_exhaustion", TokenType::AssertExhaustion},
-#line 436 "src/lexer-keywords.txt"
+#line 435 "src/lexer-keywords.txt"
{"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne},
{""},
-#line 431 "src/lexer-keywords.txt"
+#line 430 "src/lexer-keywords.txt"
{"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU},
-#line 427 "src/lexer-keywords.txt"
+#line 426 "src/lexer-keywords.txt"
{"i8x16.le_s", TokenType::Compare, Opcode::I8X16LeS},
{""}, {""}, {""},
-#line 428 "src/lexer-keywords.txt"
+#line 427 "src/lexer-keywords.txt"
{"i8x16.le_u", TokenType::Compare, Opcode::I8X16LeU},
{""}, {""},
-#line 378 "src/lexer-keywords.txt"
+#line 377 "src/lexer-keywords.txt"
{"i64.shl", TokenType::Binary, Opcode::I64Shl},
-#line 253 "src/lexer-keywords.txt"
+#line 252 "src/lexer-keywords.txt"
{"i32.shl", TokenType::Binary, Opcode::I32Shl},
{""}, {""},
-#line 339 "src/lexer-keywords.txt"
+#line 338 "src/lexer-keywords.txt"
{"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8},
-#line 219 "src/lexer-keywords.txt"
+#line 218 "src/lexer-keywords.txt"
{"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8},
{""}, {""}, {""}, {""},
-#line 432 "src/lexer-keywords.txt"
+#line 431 "src/lexer-keywords.txt"
{"i8x16.mul", TokenType::Binary, Opcode::I8X16Mul},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 271 "src/lexer-keywords.txt"
+#line 270 "src/lexer-keywords.txt"
{"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue},
#line 18 "src/lexer-keywords.txt"
{"anyref", Type::Anyref},
{""}, {""}, {""}, {""},
-#line 172 "src/lexer-keywords.txt"
+#line 171 "src/lexer-keywords.txt"
{"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS},
-#line 519 "src/lexer-keywords.txt"
+#line 518 "src/lexer-keywords.txt"
{"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32},
-#line 178 "src/lexer-keywords.txt"
+#line 177 "src/lexer-keywords.txt"
{"i16x8.ne", TokenType::Compare, Opcode::I16X8Ne},
{""},
-#line 173 "src/lexer-keywords.txt"
+#line 172 "src/lexer-keywords.txt"
{"i16x8.lt_u", TokenType::Compare, Opcode::I16X8LtU},
-#line 167 "src/lexer-keywords.txt"
+#line 166 "src/lexer-keywords.txt"
{"i16x8.le_s", TokenType::Compare, Opcode::I16X8LeS},
{""}, {""}, {""},
-#line 168 "src/lexer-keywords.txt"
+#line 167 "src/lexer-keywords.txt"
{"i16x8.le_u", TokenType::Compare, Opcode::I16X8LeU},
{""},
-#line 444 "src/lexer-keywords.txt"
+#line 443 "src/lexer-keywords.txt"
{"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub},
{""}, {""},
-#line 458 "src/lexer-keywords.txt"
+#line 457 "src/lexer-keywords.txt"
{"memory.size", TokenType::MemorySize, Opcode::MemorySize},
-#line 118 "src/lexer-keywords.txt"
+#line 117 "src/lexer-keywords.txt"
{"f64.neg", TokenType::Unary, Opcode::F64Neg},
-#line 68 "src/lexer-keywords.txt"
+#line 67 "src/lexer-keywords.txt"
{"f32.neg", TokenType::Unary, Opcode::F32Neg},
-#line 401 "src/lexer-keywords.txt"
+#line 400 "src/lexer-keywords.txt"
{"i64x2.load_splat", TokenType::Load, Opcode::I64X2LoadSplat},
{""},
-#line 457 "src/lexer-keywords.txt"
+#line 456 "src/lexer-keywords.txt"
{"memory.init", TokenType::MemoryInit, Opcode::MemoryInit},
{""}, {""},
-#line 174 "src/lexer-keywords.txt"
+#line 173 "src/lexer-keywords.txt"
{"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul},
-#line 35 "src/lexer-keywords.txt"
+#line 34 "src/lexer-keywords.txt"
{"catch", TokenType::Catch, Opcode::Catch},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 379 "src/lexer-keywords.txt"
+#line 378 "src/lexer-keywords.txt"
{"i64.shr_s", TokenType::Binary, Opcode::I64ShrS},
-#line 254 "src/lexer-keywords.txt"
+#line 253 "src/lexer-keywords.txt"
{"i32.shr_s", TokenType::Binary, Opcode::I32ShrS},
{""}, {""}, {""}, {""}, {""},
-#line 455 "src/lexer-keywords.txt"
+#line 454 "src/lexer-keywords.txt"
{"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill},
-#line 380 "src/lexer-keywords.txt"
+#line 379 "src/lexer-keywords.txt"
{"i64.shr_u", TokenType::Binary, Opcode::I64ShrU},
-#line 255 "src/lexer-keywords.txt"
+#line 254 "src/lexer-keywords.txt"
{"i32.shr_u", TokenType::Binary, Opcode::I32ShrU},
{""}, {""}, {""}, {""},
-#line 186 "src/lexer-keywords.txt"
+#line 185 "src/lexer-keywords.txt"
{"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub},
{""}, {""}, {""}, {""},
-#line 325 "src/lexer-keywords.txt"
+#line 324 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU},
-#line 206 "src/lexer-keywords.txt"
+#line 205 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU},
{""},
-#line 415 "src/lexer-keywords.txt"
+#line 414 "src/lexer-keywords.txt"
{"i8x16.add", TokenType::Binary, Opcode::I8X16Add},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 445 "src/lexer-keywords.txt"
+#line 444 "src/lexer-keywords.txt"
{"i8x16", TokenType::I8X16},
{""}, {""},
-#line 80 "src/lexer-keywords.txt"
+#line 79 "src/lexer-keywords.txt"
{"f32x4.div", TokenType::Binary, Opcode::F32X4Div},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 132 "src/lexer-keywords.txt"
+#line 131 "src/lexer-keywords.txt"
{"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
-#line 544 "src/lexer-keywords.txt"
+#line 543 "src/lexer-keywords.txt"
{"set_global", TokenType::GlobalSet, Opcode::GlobalSet},
{""}, {""},
-#line 157 "src/lexer-keywords.txt"
+#line 156 "src/lexer-keywords.txt"
{"i16x8.add", TokenType::Binary, Opcode::I16X8Add},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 151 "src/lexer-keywords.txt"
+#line 150 "src/lexer-keywords.txt"
{"global.get", TokenType::GlobalGet, Opcode::GlobalGet},
{""}, {""},
-#line 349 "src/lexer-keywords.txt"
+#line 348 "src/lexer-keywords.txt"
{"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S},
-#line 229 "src/lexer-keywords.txt"
+#line 228 "src/lexer-keywords.txt"
{"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S},
-#line 326 "src/lexer-keywords.txt"
+#line 325 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU},
-#line 207 "src/lexer-keywords.txt"
+#line 206 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 442 "src/lexer-keywords.txt"
+#line 441 "src/lexer-keywords.txt"
{"i8x16.sub_saturate_s", TokenType::Binary, Opcode::I8X16SubSaturateS},
{""}, {""}, {""},
-#line 443 "src/lexer-keywords.txt"
+#line 442 "src/lexer-keywords.txt"
{"i8x16.sub_saturate_u", TokenType::Binary, Opcode::I8X16SubSaturateU},
{""},
-#line 84 "src/lexer-keywords.txt"
+#line 83 "src/lexer-keywords.txt"
{"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt},
{""}, {""}, {""},
-#line 464 "src/lexer-keywords.txt"
+#line 463 "src/lexer-keywords.txt"
{"nop", TokenType::Nop, Opcode::Nop},
{""},
-#line 404 "src/lexer-keywords.txt"
+#line 403 "src/lexer-keywords.txt"
{"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl},
-#line 70 "src/lexer-keywords.txt"
+#line 69 "src/lexer-keywords.txt"
{"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32},
{""},
-#line 277 "src/lexer-keywords.txt"
+#line 276 "src/lexer-keywords.txt"
{"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS},
-#line 83 "src/lexer-keywords.txt"
+#line 82 "src/lexer-keywords.txt"
{"f32x4.ge", TokenType::Compare, Opcode::F32X4Ge},
-#line 416 "src/lexer-keywords.txt"
+#line 415 "src/lexer-keywords.txt"
{"i8x16.all_true", TokenType::Unary, Opcode::I8X16AllTrue},
{""},
-#line 278 "src/lexer-keywords.txt"
+#line 277 "src/lexer-keywords.txt"
{"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU},
-#line 275 "src/lexer-keywords.txt"
+#line 274 "src/lexer-keywords.txt"
{"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS},
-#line 322 "src/lexer-keywords.txt"
+#line 321 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU},
{""}, {""},
-#line 276 "src/lexer-keywords.txt"
+#line 275 "src/lexer-keywords.txt"
{"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU},
{""}, {""}, {""},
-#line 504 "src/lexer-keywords.txt"
+#line 503 "src/lexer-keywords.txt"
{"v128.xor", TokenType::Binary, Opcode::V128Xor},
{""},
-#line 412 "src/lexer-keywords.txt"
+#line 411 "src/lexer-keywords.txt"
{"i64.xor", TokenType::Binary, Opcode::I64Xor},
-#line 302 "src/lexer-keywords.txt"
+#line 301 "src/lexer-keywords.txt"
{"i32.xor", TokenType::Binary, Opcode::I32Xor},
{""},
-#line 399 "src/lexer-keywords.txt"
+#line 398 "src/lexer-keywords.txt"
{"i64x2.load32x2_s", TokenType::Load, Opcode::I64X2Load32X2S},
-#line 141 "src/lexer-keywords.txt"
+#line 140 "src/lexer-keywords.txt"
{"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg},
-#line 184 "src/lexer-keywords.txt"
+#line 183 "src/lexer-keywords.txt"
{"i16x8.sub_saturate_s", TokenType::Binary, Opcode::I16X8SubSaturateS},
{""},
-#line 402 "src/lexer-keywords.txt"
+#line 401 "src/lexer-keywords.txt"
{"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg},
{""},
-#line 185 "src/lexer-keywords.txt"
+#line 184 "src/lexer-keywords.txt"
{"i16x8.sub_saturate_u", TokenType::Binary, Opcode::I16X8SubSaturateU},
{""},
-#line 400 "src/lexer-keywords.txt"
+#line 399 "src/lexer-keywords.txt"
{"i64x2.load32x2_u", TokenType::Load, Opcode::I64X2Load32X2U},
{""}, {""}, {""}, {""}, {""},
-#line 133 "src/lexer-keywords.txt"
+#line 132 "src/lexer-keywords.txt"
{"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane},
-#line 121 "src/lexer-keywords.txt"
+#line 120 "src/lexer-keywords.txt"
{"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64},
{""},
-#line 398 "src/lexer-keywords.txt"
+#line 397 "src/lexer-keywords.txt"
{"i64x2.extract_lane", TokenType::SimdLaneOp, Opcode::I64X2ExtractLane},
-#line 413 "src/lexer-keywords.txt"
+#line 412 "src/lexer-keywords.txt"
{"i8x16.add_saturate_s", TokenType::Binary, Opcode::I8X16AddSaturateS},
-#line 158 "src/lexer-keywords.txt"
+#line 157 "src/lexer-keywords.txt"
{"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue},
{""}, {""},
-#line 414 "src/lexer-keywords.txt"
+#line 413 "src/lexer-keywords.txt"
{"i8x16.add_saturate_u", TokenType::Binary, Opcode::I8X16AddSaturateU},
-#line 372 "src/lexer-keywords.txt"
+#line 371 "src/lexer-keywords.txt"
{"i64.popcnt", TokenType::Unary, Opcode::I64Popcnt},
-#line 247 "src/lexer-keywords.txt"
+#line 246 "src/lexer-keywords.txt"
{"i32.popcnt", TokenType::Unary, Opcode::I32Popcnt},
{""}, {""}, {""},
-#line 94 "src/lexer-keywords.txt"
+#line 93 "src/lexer-keywords.txt"
{"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt},
{""},
-#line 405 "src/lexer-keywords.txt"
+#line 404 "src/lexer-keywords.txt"
{"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 406 "src/lexer-keywords.txt"
+#line 405 "src/lexer-keywords.txt"
{"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 321 "src/lexer-keywords.txt"
+#line 320 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU},
{""}, {""}, {""}, {""},
-#line 155 "src/lexer-keywords.txt"
+#line 154 "src/lexer-keywords.txt"
{"i16x8.add_saturate_s", TokenType::Binary, Opcode::I16X8AddSaturateS},
{""}, {""}, {""},
-#line 156 "src/lexer-keywords.txt"
+#line 155 "src/lexer-keywords.txt"
{"i16x8.add_saturate_u", TokenType::Binary, Opcode::I16X8AddSaturateU},
-#line 514 "src/lexer-keywords.txt"
+#line 513 "src/lexer-keywords.txt"
{"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32},
{""}, {""},
-#line 392 "src/lexer-keywords.txt"
+#line 391 "src/lexer-keywords.txt"
{"i64.trunc_sat_f64_s", TokenType::Convert, Opcode::I64TruncSatF64S},
-#line 266 "src/lexer-keywords.txt"
+#line 265 "src/lexer-keywords.txt"
{"i32.trunc_sat_f64_s", TokenType::Convert, Opcode::I32TruncSatF64S},
{""}, {""}, {""}, {""}, {""},
-#line 143 "src/lexer-keywords.txt"
+#line 142 "src/lexer-keywords.txt"
{"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane},
-#line 393 "src/lexer-keywords.txt"
+#line 392 "src/lexer-keywords.txt"
{"i64.trunc_sat_f64_u", TokenType::Convert, Opcode::I64TruncSatF64U},
-#line 267 "src/lexer-keywords.txt"
+#line 266 "src/lexer-keywords.txt"
{"i32.trunc_sat_f64_u", TokenType::Convert, Opcode::I32TruncSatF64U},
-#line 403 "src/lexer-keywords.txt"
+#line 402 "src/lexer-keywords.txt"
{"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane},
{""}, {""},
-#line 410 "src/lexer-keywords.txt"
+#line 409 "src/lexer-keywords.txt"
{"i64x2.trunc_sat_f64x2_s", TokenType::Unary, Opcode::I64X2TruncSatF64X2S},
-#line 505 "src/lexer-keywords.txt"
+#line 504 "src/lexer-keywords.txt"
{"v8x16.swizzle", TokenType::Binary, Opcode::V8X16Swizzle},
{""},
-#line 93 "src/lexer-keywords.txt"
+#line 92 "src/lexer-keywords.txt"
{"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat},
-#line 411 "src/lexer-keywords.txt"
+#line 410 "src/lexer-keywords.txt"
{"i64x2.trunc_sat_f64x2_u", TokenType::Unary, Opcode::I64X2TruncSatF64X2U},
{""},
-#line 293 "src/lexer-keywords.txt"
+#line 292 "src/lexer-keywords.txt"
{"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat},
{""}, {""}, {""},
-#line 516 "src/lexer-keywords.txt"
+#line 515 "src/lexer-keywords.txt"
{"f64.convert_s/i64", TokenType::Convert, Opcode::F64ConvertI64S},
-#line 510 "src/lexer-keywords.txt"
+#line 509 "src/lexer-keywords.txt"
{"f32.convert_s/i64", TokenType::Convert, Opcode::F32ConvertI64S},
{""},
-#line 494 "src/lexer-keywords.txt"
+#line 493 "src/lexer-keywords.txt"
{"unreachable", TokenType::Unreachable, Opcode::Unreachable},
-#line 518 "src/lexer-keywords.txt"
+#line 517 "src/lexer-keywords.txt"
{"f64.convert_u/i64", TokenType::Convert, Opcode::F64ConvertI64U},
-#line 512 "src/lexer-keywords.txt"
+#line 511 "src/lexer-keywords.txt"
{"f32.convert_u/i64", TokenType::Convert, Opcode::F32ConvertI64U},
{""}, {""}, {""},
-#line 520 "src/lexer-keywords.txt"
+#line 519 "src/lexer-keywords.txt"
{"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64},
{""},
-#line 114 "src/lexer-keywords.txt"
+#line 113 "src/lexer-keywords.txt"
{"f64.max", TokenType::Binary, Opcode::F64Max},
-#line 64 "src/lexer-keywords.txt"
+#line 63 "src/lexer-keywords.txt"
{"f32.max", TokenType::Binary, Opcode::F32Max},
{""},
-#line 538 "src/lexer-keywords.txt"
+#line 537 "src/lexer-keywords.txt"
{"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S},
-#line 526 "src/lexer-keywords.txt"
+#line 525 "src/lexer-keywords.txt"
{"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S},
{""}, {""},
-#line 542 "src/lexer-keywords.txt"
+#line 541 "src/lexer-keywords.txt"
{"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U},
-#line 530 "src/lexer-keywords.txt"
+#line 529 "src/lexer-keywords.txt"
{"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""},
-#line 24 "src/lexer-keywords.txt"
+#line 23 "src/lexer-keywords.txt"
{"assert_trap", TokenType::AssertTrap},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 425 "src/lexer-keywords.txt"
+#line 424 "src/lexer-keywords.txt"
{"i8x16.gt_s", TokenType::Compare, Opcode::I8X16GtS},
{""}, {""}, {""},
-#line 426 "src/lexer-keywords.txt"
+#line 425 "src/lexer-keywords.txt"
{"i8x16.gt_u", TokenType::Compare, Opcode::I8X16GtU},
-#line 423 "src/lexer-keywords.txt"
+#line 422 "src/lexer-keywords.txt"
{"i8x16.ge_s", TokenType::Compare, Opcode::I8X16GeS},
{""}, {""},
-#line 397 "src/lexer-keywords.txt"
+#line 396 "src/lexer-keywords.txt"
{"i64x2.any_true", TokenType::Unary, Opcode::I64X2AnyTrue},
-#line 424 "src/lexer-keywords.txt"
+#line 423 "src/lexer-keywords.txt"
{"i8x16.ge_u", TokenType::Compare, Opcode::I8X16GeU},
-#line 539 "src/lexer-keywords.txt"
+#line 538 "src/lexer-keywords.txt"
{"i64.trunc_s:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64S},
-#line 527 "src/lexer-keywords.txt"
+#line 526 "src/lexer-keywords.txt"
{"i32.trunc_s:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64S},
{""}, {""},
-#line 543 "src/lexer-keywords.txt"
+#line 542 "src/lexer-keywords.txt"
{"i64.trunc_u:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64U},
-#line 531 "src/lexer-keywords.txt"
+#line 530 "src/lexer-keywords.txt"
{"i32.trunc_u:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64U},
{""}, {""}, {""}, {""}, {""},
-#line 315 "src/lexer-keywords.txt"
+#line 314 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU},
-#line 203 "src/lexer-keywords.txt"
+#line 202 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU},
{""}, {""}, {""},
-#line 462 "src/lexer-keywords.txt"
+#line 461 "src/lexer-keywords.txt"
{"nan:arithmetic", TokenType::NanArithmetic},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 300 "src/lexer-keywords.txt"
+#line 299 "src/lexer-keywords.txt"
{"i32x4.widen_low_i16x8_s", TokenType::Unary, Opcode::I32X4WidenLowI16X8S},
-#line 508 "src/lexer-keywords.txt"
+#line 507 "src/lexer-keywords.txt"
{"anyfunc", Type::Funcref},
-#line 165 "src/lexer-keywords.txt"
+#line 164 "src/lexer-keywords.txt"
{"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS},
{""},
-#line 301 "src/lexer-keywords.txt"
+#line 300 "src/lexer-keywords.txt"
{"i32x4.widen_low_i16x8_u", TokenType::Unary, Opcode::I32X4WidenLowI16X8U},
{""},
-#line 166 "src/lexer-keywords.txt"
+#line 165 "src/lexer-keywords.txt"
{"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU},
-#line 163 "src/lexer-keywords.txt"
+#line 162 "src/lexer-keywords.txt"
{"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS},
{""}, {""}, {""},
-#line 164 "src/lexer-keywords.txt"
+#line 163 "src/lexer-keywords.txt"
{"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
-#line 283 "src/lexer-keywords.txt"
+#line 282 "src/lexer-keywords.txt"
{"i32x4.load_splat", TokenType::Load, Opcode::I32X4LoadSplat},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
-#line 314 "src/lexer-keywords.txt"
+#line 313 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XchgU},
-#line 202 "src/lexer-keywords.txt"
+#line 201 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XchgU},
{""},
-#line 40 "src/lexer-keywords.txt"
+#line 39 "src/lexer-keywords.txt"
{"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop},
{""}, {""},
-#line 329 "src/lexer-keywords.txt"
+#line 328 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU},
-#line 210 "src/lexer-keywords.txt"
+#line 209 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 37 "src/lexer-keywords.txt"
+#line 36 "src/lexer-keywords.txt"
{"data.drop", TokenType::DataDrop, Opcode::DataDrop},
{""},
-#line 441 "src/lexer-keywords.txt"
+#line 440 "src/lexer-keywords.txt"
{"i8x16.splat", TokenType::Unary, Opcode::I8X16Splat},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 138 "src/lexer-keywords.txt"
+#line 137 "src/lexer-keywords.txt"
{"f64x2.max", TokenType::Binary, Opcode::F64X2Max},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 81 "src/lexer-keywords.txt"
+#line 80 "src/lexer-keywords.txt"
{"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq},
{""}, {""},
-#line 273 "src/lexer-keywords.txt"
+#line 272 "src/lexer-keywords.txt"
{"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 183 "src/lexer-keywords.txt"
+#line 182 "src/lexer-keywords.txt"
{"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat},
{""}, {""}, {""}, {""},
-#line 521 "src/lexer-keywords.txt"
+#line 520 "src/lexer-keywords.txt"
{"get_global", TokenType::GlobalGet, Opcode::GlobalGet},
{""}, {""}, {""}, {""}, {""},
-#line 248 "src/lexer-keywords.txt"
+#line 247 "src/lexer-keywords.txt"
{"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
-#line 418 "src/lexer-keywords.txt"
+#line 417 "src/lexer-keywords.txt"
{"i8x16.avgr_u", TokenType::Binary, Opcode::I8X16AvgrU},
{""},
-#line 373 "src/lexer-keywords.txt"
+#line 372 "src/lexer-keywords.txt"
{"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64},
-#line 290 "src/lexer-keywords.txt"
+#line 289 "src/lexer-keywords.txt"
{"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 269 "src/lexer-keywords.txt"
+#line 268 "src/lexer-keywords.txt"
{"i32.wrap_i64", TokenType::Convert, Opcode::I32WrapI64},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 90 "src/lexer-keywords.txt"
+#line 89 "src/lexer-keywords.txt"
{"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg},
{""}, {""},
-#line 287 "src/lexer-keywords.txt"
+#line 286 "src/lexer-keywords.txt"
{"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg},
{""}, {""},
-#line 429 "src/lexer-keywords.txt"
+#line 428 "src/lexer-keywords.txt"
{"i8x16.load_splat", TokenType::Load, Opcode::I8X16LoadSplat},
-#line 456 "src/lexer-keywords.txt"
+#line 455 "src/lexer-keywords.txt"
{"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow},
{""}, {""},
-#line 419 "src/lexer-keywords.txt"
+#line 418 "src/lexer-keywords.txt"
{"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU},
{""}, {""},
-#line 82 "src/lexer-keywords.txt"
+#line 81 "src/lexer-keywords.txt"
{"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane},
{""}, {""},
-#line 274 "src/lexer-keywords.txt"
+#line 273 "src/lexer-keywords.txt"
{"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane},
{""}, {""}, {""},
-#line 523 "src/lexer-keywords.txt"
+#line 522 "src/lexer-keywords.txt"
{"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 291 "src/lexer-keywords.txt"
+#line 290 "src/lexer-keywords.txt"
{"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 296 "src/lexer-keywords.txt"
+#line 295 "src/lexer-keywords.txt"
{"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S},
-#line 292 "src/lexer-keywords.txt"
+#line 291 "src/lexer-keywords.txt"
{"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU},
{""}, {""},
-#line 297 "src/lexer-keywords.txt"
+#line 296 "src/lexer-keywords.txt"
{"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U},
-#line 171 "src/lexer-keywords.txt"
+#line 170 "src/lexer-keywords.txt"
{"i16x8.load_splat", TokenType::Load, Opcode::I16X8LoadSplat},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 535 "src/lexer-keywords.txt"
+#line 534 "src/lexer-keywords.txt"
{"i64.reinterpret/f64", TokenType::Convert, Opcode::I64ReinterpretF64},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 532 "src/lexer-keywords.txt"
+#line 531 "src/lexer-keywords.txt"
{"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64},
-#line 420 "src/lexer-keywords.txt"
+#line 419 "src/lexer-keywords.txt"
{"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq},
{""},
-#line 92 "src/lexer-keywords.txt"
+#line 91 "src/lexer-keywords.txt"
{"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane},
{""},
-#line 482 "src/lexer-keywords.txt"
+#line 481 "src/lexer-keywords.txt"
{"table.copy", TokenType::TableCopy, Opcode::TableCopy},
-#line 289 "src/lexer-keywords.txt"
+#line 288 "src/lexer-keywords.txt"
{"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 169 "src/lexer-keywords.txt"
+#line 168 "src/lexer-keywords.txt"
{"i16x8.load8x8_s", TokenType::Load, Opcode::I16X8Load8X8S},
{""}, {""},
-#line 492 "src/lexer-keywords.txt"
+#line 491 "src/lexer-keywords.txt"
{"try", TokenType::Try, Opcode::Try},
-#line 170 "src/lexer-keywords.txt"
+#line 169 "src/lexer-keywords.txt"
{"i16x8.load8x8_u", TokenType::Load, Opcode::I16X8Load8X8U},
{""}, {""},
-#line 160 "src/lexer-keywords.txt"
+#line 159 "src/lexer-keywords.txt"
{"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq},
{""},
-#line 336 "src/lexer-keywords.txt"
+#line 335 "src/lexer-keywords.txt"
{"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor},
-#line 217 "src/lexer-keywords.txt"
+#line 216 "src/lexer-keywords.txt"
{"i32.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I32AtomicRmwXor},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 459 "src/lexer-keywords.txt"
+#line 458 "src/lexer-keywords.txt"
{"memory", TokenType::Memory},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 438 "src/lexer-keywords.txt"
+#line 437 "src/lexer-keywords.txt"
{"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""},
-#line 272 "src/lexer-keywords.txt"
+#line 271 "src/lexer-keywords.txt"
{"i32x4.any_true", TokenType::Unary, Opcode::I32X4AnyTrue},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 435 "src/lexer-keywords.txt"
+#line 434 "src/lexer-keywords.txt"
{"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 27 "src/lexer-keywords.txt"
+#line 26 "src/lexer-keywords.txt"
{"binary", TokenType::Bin},
{""}, {""},
-#line 180 "src/lexer-keywords.txt"
+#line 179 "src/lexer-keywords.txt"
{"i16x8.shl", TokenType::Binary, Opcode::I16X8Shl},
{""}, {""}, {""},
-#line 421 "src/lexer-keywords.txt"
+#line 420 "src/lexer-keywords.txt"
{"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS},
{""}, {""}, {""},
-#line 422 "src/lexer-keywords.txt"
+#line 421 "src/lexer-keywords.txt"
{"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU},
-#line 281 "src/lexer-keywords.txt"
+#line 280 "src/lexer-keywords.txt"
{"i32x4.load16x4_s", TokenType::Load, Opcode::I32X4Load16X4S},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 439 "src/lexer-keywords.txt"
+#line 438 "src/lexer-keywords.txt"
{"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS},
-#line 282 "src/lexer-keywords.txt"
+#line 281 "src/lexer-keywords.txt"
{"i32x4.load16x4_u", TokenType::Load, Opcode::I32X4Load16X4U},
{""}, {""}, {""}, {""},
-#line 189 "src/lexer-keywords.txt"
+#line 188 "src/lexer-keywords.txt"
{"i16x8.widen_low_i8x16_s", TokenType::Unary, Opcode::I16X8WidenLowI8X16S},
{""},
-#line 440 "src/lexer-keywords.txt"
+#line 439 "src/lexer-keywords.txt"
{"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU},
-#line 177 "src/lexer-keywords.txt"
+#line 176 "src/lexer-keywords.txt"
{"i16x8.neg", TokenType::Unary, Opcode::I16X8Neg},
-#line 190 "src/lexer-keywords.txt"
+#line 189 "src/lexer-keywords.txt"
{"i16x8.widen_low_i8x16_u", TokenType::Unary, Opcode::I16X8WidenLowI8X16U},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
-#line 161 "src/lexer-keywords.txt"
+#line 160 "src/lexer-keywords.txt"
{"i16x8.extract_lane_s", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS},
{""}, {""}, {""},
-#line 162 "src/lexer-keywords.txt"
+#line 161 "src/lexer-keywords.txt"
{"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU},
{""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 181 "src/lexer-keywords.txt"
+#line 180 "src/lexer-keywords.txt"
{"i16x8.shr_s", TokenType::Binary, Opcode::I16X8ShrS},
{""}, {""}, {""}, {""}, {""},
-#line 437 "src/lexer-keywords.txt"
+#line 436 "src/lexer-keywords.txt"
{"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane},
{""},
-#line 182 "src/lexer-keywords.txt"
+#line 181 "src/lexer-keywords.txt"
{"i16x8.shr_u", TokenType::Binary, Opcode::I16X8ShrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""},
-#line 87 "src/lexer-keywords.txt"
+#line 86 "src/lexer-keywords.txt"
{"f32x4.max", TokenType::Binary, Opcode::F32X4Max},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""},
-#line 179 "src/lexer-keywords.txt"
+#line 178 "src/lexer-keywords.txt"
{"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane},
-#line 506 "src/lexer-keywords.txt"
+#line 505 "src/lexer-keywords.txt"
{"v8x16.shuffle", TokenType::SimdShuffleOp, Opcode::V8X16Shuffle},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 78 "src/lexer-keywords.txt"
+#line 77 "src/lexer-keywords.txt"
{"f32x4.convert_i32x4_s", TokenType::Unary, Opcode::F32X4ConvertI32X4S},
{""}, {""}, {""},
-#line 79 "src/lexer-keywords.txt"
+#line 78 "src/lexer-keywords.txt"
{"f32x4.convert_i32x4_u", TokenType::Unary, Opcode::F32X4ConvertI32X4U},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 417 "src/lexer-keywords.txt"
+#line 416 "src/lexer-keywords.txt"
{"i8x16.any_true", TokenType::Unary, Opcode::I8X16AnyTrue},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 129 "src/lexer-keywords.txt"
+#line 128 "src/lexer-keywords.txt"
{"f64x2.convert_i64x2_s", TokenType::Unary, Opcode::F64X2ConvertI64X2S},
{""}, {""}, {""},
-#line 130 "src/lexer-keywords.txt"
+#line 129 "src/lexer-keywords.txt"
{"f64x2.convert_i64x2_u", TokenType::Unary, Opcode::F64X2ConvertI64X2U},
{""}, {""}, {""},
-#line 159 "src/lexer-keywords.txt"
+#line 158 "src/lexer-keywords.txt"
{"i16x8.any_true", TokenType::Unary, Opcode::I16X8AnyTrue},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 105 "src/lexer-keywords.txt"
+#line 104 "src/lexer-keywords.txt"
{"f64.copysign", TokenType::Binary, Opcode::F64Copysign},
-#line 54 "src/lexer-keywords.txt"
+#line 53 "src/lexer-keywords.txt"
{"f32.copysign", TokenType::Binary, Opcode::F32Copysign},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -1485,34 +1483,34 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
-#line 332 "src/lexer-keywords.txt"
+#line 331 "src/lexer-keywords.txt"
{"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg},
-#line 213 "src/lexer-keywords.txt"
+#line 212 "src/lexer-keywords.txt"
{"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg},
{""}, {""}, {""}, {""},
-#line 175 "src/lexer-keywords.txt"
+#line 174 "src/lexer-keywords.txt"
{"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S},
{""}, {""}, {""},
-#line 176 "src/lexer-keywords.txt"
+#line 175 "src/lexer-keywords.txt"
{"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 26 "src/lexer-keywords.txt"
+#line 25 "src/lexer-keywords.txt"
{"atomic.notify", TokenType::AtomicNotify, Opcode::AtomicNotify},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
-#line 36 "src/lexer-keywords.txt"
+#line 35 "src/lexer-keywords.txt"
{"current_memory", TokenType::MemorySize, Opcode::MemorySize},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""},
-#line 328 "src/lexer-keywords.txt"
+#line 327 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XchgU},
-#line 209 "src/lexer-keywords.txt"
+#line 208 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XchgU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -1520,13 +1518,13 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
-#line 154 "src/lexer-keywords.txt"
+#line 153 "src/lexer-keywords.txt"
{"grow_memory", TokenType::MemoryGrow, Opcode::MemoryGrow},
{""},
-#line 433 "src/lexer-keywords.txt"
+#line 432 "src/lexer-keywords.txt"
{"i8x16.narrow_i16x8_s", TokenType::Binary, Opcode::I8X16NarrowI16X8S},
{""}, {""}, {""},
-#line 434 "src/lexer-keywords.txt"
+#line 433 "src/lexer-keywords.txt"
{"i8x16.narrow_i16x8_u", TokenType::Binary, Opcode::I8X16NarrowI16X8U},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -1561,15 +1559,15 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
-#line 298 "src/lexer-keywords.txt"
+#line 297 "src/lexer-keywords.txt"
{"i32x4.widen_high_i16x8_s", TokenType::Unary, Opcode::I32X4WidenHighI16X8S},
{""}, {""}, {""},
-#line 299 "src/lexer-keywords.txt"
+#line 298 "src/lexer-keywords.txt"
{"i32x4.widen_high_i16x8_u", TokenType::Unary, Opcode::I32X4WidenHighI16X8U},
{""}, {""}, {""}, {""},
-#line 335 "src/lexer-keywords.txt"
+#line 334 "src/lexer-keywords.txt"
{"i64.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I64AtomicRmwXchg},
-#line 216 "src/lexer-keywords.txt"
+#line 215 "src/lexer-keywords.txt"
{"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -1578,13 +1576,13 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
-#line 187 "src/lexer-keywords.txt"
+#line 186 "src/lexer-keywords.txt"
{"i16x8.widen_high_i8x16_s", TokenType::Unary, Opcode::I16X8WidenHighI8X16S},
{""}, {""}, {""},
-#line 188 "src/lexer-keywords.txt"
+#line 187 "src/lexer-keywords.txt"
{"i16x8.widen_high_i8x16_u", TokenType::Unary, Opcode::I16X8WidenHighI8X16U},
{""}, {""}, {""}, {""}, {""},
-#line 454 "src/lexer-keywords.txt"
+#line 453 "src/lexer-keywords.txt"
{"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy}
};
diff --git a/src/resolve-names.cc b/src/resolve-names.cc
index 6210c1bf..6391e2af 100644
--- a/src/resolve-names.cc
+++ b/src/resolve-names.cc
@@ -514,7 +514,6 @@ void NameResolver::VisitCommand(Command* command) {
case CommandType::Action:
case CommandType::AssertReturn:
- case CommandType::AssertReturnFunc:
case CommandType::AssertTrap:
case CommandType::AssertExhaustion:
case CommandType::Register:
diff --git a/src/token.def b/src/token.def
index 54f68564..f2b97ab7 100644
--- a/src/token.def
+++ b/src/token.def
@@ -24,7 +24,6 @@ WABT_TOKEN(AssertExhaustion, "assert_exhaustion")
WABT_TOKEN(AssertInvalid, "assert_invalid")
WABT_TOKEN(AssertMalformed, "assert_malformed")
WABT_TOKEN(AssertReturn, "assert_return")
-WABT_TOKEN(AssertReturnFunc, "assert_return_func")
WABT_TOKEN(AssertTrap, "assert_trap")
WABT_TOKEN(AssertUnlinkable, "assert_unlinkable")
WABT_TOKEN(Bin, "bin")
diff --git a/src/tools/spectest-interp.cc b/src/tools/spectest-interp.cc
index f335e572..4e310d68 100644
--- a/src/tools/spectest-interp.cc
+++ b/src/tools/spectest-interp.cc
@@ -169,12 +169,6 @@ class AssertReturnCommand : public CommandMixin<CommandType::AssertReturn> {
std::vector<ExpectedValue> expected;
};
-class AssertReturnFuncCommand
- : public CommandMixin<CommandType::AssertReturnFunc> {
- public:
- Action action;
-};
-
template <CommandType TypeEnum>
class AssertTrapCommandBase : public CommandMixin<TypeEnum> {
public:
@@ -816,13 +810,6 @@ wabt::Result JSONParser::ParseCommand(CommandPtr* out_command) {
EXPECT_KEY("expected");
CHECK_RESULT(ParseExpectedValues(&command->expected));
*out_command = std::move(command);
- } else if (Match("\"assert_return_func\"")) {
- auto command = MakeUnique<AssertReturnFuncCommand>();
- EXPECT(",");
- CHECK_RESULT(ParseLine(&command->line));
- EXPECT(",");
- CHECK_RESULT(ParseAction(&command->action));
- *out_command = std::move(command);
} else if (Match("\"assert_trap\"")) {
auto command = MakeUnique<AssertTrapCommand>();
EXPECT(",");
@@ -898,7 +885,6 @@ class CommandRunner {
wabt::Result OnAssertUninstantiableCommand(
const AssertUninstantiableCommand*);
wabt::Result OnAssertReturnCommand(const AssertReturnCommand*);
- wabt::Result OnAssertReturnFuncCommand(const AssertReturnFuncCommand*);
wabt::Result OnAssertTrapCommand(const AssertTrapCommand*);
wabt::Result OnAssertExhaustionCommand(const AssertExhaustionCommand*);
@@ -1004,11 +990,6 @@ wabt::Result CommandRunner::Run(const Script& script) {
OnAssertReturnCommand(cast<AssertReturnCommand>(command.get())));
break;
- case CommandType::AssertReturnFunc:
- TallyCommand(
- OnAssertReturnFuncCommand(cast<AssertReturnFuncCommand>(command.get())));
- break;
-
case CommandType::AssertTrap:
TallyCommand(
OnAssertTrapCommand(cast<AssertTrapCommand>(command.get())));
@@ -1339,35 +1320,6 @@ static bool TypedValuesAreEqual(const TypedValue& tv1, const TypedValue& tv2) {
}
}
-wabt::Result CommandRunner::OnAssertReturnFuncCommand(
- const AssertReturnFuncCommand* command) {
- ExecResult exec_result =
- RunAction(command->line, &command->action, RunVerbosity::Quiet);
-
- if (!exec_result.ok()) {
- PrintError(command->line, "unexpected trap: %s",
- ResultToString(exec_result.result).c_str());
- return wabt::Result::Error;
- }
-
- if (exec_result.values.size() != 1) {
- PrintError(command->line,
- "expected 1 result in assert_return_func, got %" PRIzd,
- exec_result.values.size());
- return wabt::Result::Error;
- }
-
- const TypedValue& result = exec_result.values[0];
- if (result.type != Type::Funcref) {
- PrintError(command->line,
- "mismatch in result of assert_return_func: expected %s, got %s",
- GetTypeName(Type::Funcref), TypedValueToString(result).c_str());
- return wabt::Result::Error;
- }
-
- return wabt::Result::Ok;
-}
-
wabt::Result CommandRunner::OnAssertReturnCommand(
const AssertReturnCommand* command) {
ExecResult exec_result =
@@ -1413,6 +1365,13 @@ wabt::Result CommandRunner::OnAssertReturnCommand(
TypedValueToString(actual).c_str());
result = wabt::Result::Error;
}
+ } else if (expected.value.type == Type::Funcref) {
+ if (actual.type != Type::Funcref) {
+ PrintError(command->line,
+ "mismatch in result %" PRIzd
+ " of assert_return: expected funcref, got %s",
+ i, TypedValueToString(actual).c_str());
+ }
} else {
if (!TypedValuesAreEqual(expected.value, actual)) {
PrintError(command->line,
diff --git a/src/validator.cc b/src/validator.cc
index 8a71af05..0e76cd15 100644
--- a/src/validator.cc
+++ b/src/validator.cc
@@ -1482,13 +1482,6 @@ void Validator::CheckCommand(const Command* command) {
// Ignore.
break;
- case CommandType::AssertReturnFunc: {
- auto* cmd = cast<AssertReturnFuncCommand>(command);
- const Action* action = cmd->action.get();
- CheckAction(action);
- break;
- }
-
case CommandType::AssertReturn: {
auto* assert_return_command = cast<AssertReturnCommand>(command);
const Action* action = assert_return_command->action.get();
diff --git a/src/wast-parser.cc b/src/wast-parser.cc
index a3d2df53..a5edc6e3 100644
--- a/src/wast-parser.cc
+++ b/src/wast-parser.cc
@@ -222,7 +222,6 @@ bool IsCommand(TokenTypePair pair) {
case TokenType::AssertInvalid:
case TokenType::AssertMalformed:
case TokenType::AssertReturn:
- case TokenType::AssertReturnFunc:
case TokenType::AssertTrap:
case TokenType::AssertUnlinkable:
case TokenType::Get:
@@ -1733,8 +1732,11 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
Var dst(0);
Var src(0);
if (options_->features.reference_types_enabled()) {
+ // TODO: disabled for now, since the spec tests don't currently use.
+#if 0
CHECK_RESULT(ParseVar(&dst));
CHECK_RESULT(ParseVar(&src));
+#endif
}
out_expr->reset(new TableCopyExpr(dst, src, loc));
break;
@@ -2174,7 +2176,8 @@ Result WastParser::ParseHostRef(Const* const_) {
Result WastParser::ParseConstList(ConstVector* consts, ConstType type) {
WABT_TRACE(ParseConstList);
while (PeekMatchLpar(TokenType::Const) || PeekMatchLpar(TokenType::RefNull) ||
- PeekMatchLpar(TokenType::RefHost)) {
+ PeekMatchLpar(TokenType::RefHost) ||
+ PeekMatchLpar(TokenType::RefFunc)) {
Consume();
Const const_;
switch (Peek()) {
@@ -2189,6 +2192,14 @@ Result WastParser::ParseConstList(ConstVector* consts, ConstType type) {
const_.ref_bits = 0;
break;
}
+ case TokenType::RefFunc: {
+ auto token = Consume();
+ ErrorUnlessOpcodeEnabled(token);
+ const_.loc = GetLocation();
+ const_.type = Type::Funcref;
+ const_.ref_bits = 0;
+ break;
+ }
case TokenType::RefHost:
CHECK_RESULT(ParseHostRef(&const_));
break;
@@ -2476,9 +2487,6 @@ Result WastParser::ParseCommand(Script* script, CommandPtr* out_command) {
case TokenType::AssertReturn:
return ParseAssertReturnCommand(out_command);
- case TokenType::AssertReturnFunc:
- return ParseAssertReturnFuncCommand(out_command);
-
case TokenType::AssertTrap:
return ParseAssertTrapCommand(out_command);
@@ -2531,17 +2539,6 @@ Result WastParser::ParseAssertReturnCommand(CommandPtr* out_command) {
return Result::Ok;
}
-Result WastParser::ParseAssertReturnFuncCommand(CommandPtr* out_command) {
- WABT_TRACE(ParseAssertReturnFuncCommand);
- EXPECT(Lpar);
- EXPECT(AssertReturnFunc);
- auto command = MakeUnique<AssertReturnFuncCommand>();
- CHECK_RESULT(ParseAction(&command->action));
- EXPECT(Rpar);
- *out_command = std::move(command);
- return Result::Ok;
-}
-
Result WastParser::ParseAssertTrapCommand(CommandPtr* out_command) {
WABT_TRACE(ParseAssertTrapCommand);
EXPECT(Lpar);