summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/binary-reader-ir.cc36
-rw-r--r--src/binary-reader-logging.cc20
-rw-r--r--src/binary-reader-logging.h11
-rw-r--r--src/binary-reader-nop.h11
-rw-r--r--src/binary-reader-objdump.cc20
-rw-r--r--src/binary-reader.cc82
-rw-r--r--src/binary-reader.h11
-rw-r--r--src/binary-writer.cc40
-rw-r--r--src/interp/binary-reader-interp.cc24
-rw-r--r--src/interp/interp-util.cc1
-rw-r--r--src/ir.cc6
-rw-r--r--src/ir.h25
-rw-r--r--src/lexer-keywords.txt1
-rw-r--r--src/prebuilt/lexer-keywords.cc1913
-rw-r--r--src/shared-validator.cc10
-rw-r--r--src/shared-validator.h10
-rw-r--r--src/token.def1
-rw-r--r--src/type.h1
-rw-r--r--src/validator.cc15
-rw-r--r--src/wast-parser.cc38
-rw-r--r--src/wat-writer.cc29
21 files changed, 1216 insertions, 1089 deletions
diff --git a/src/binary-reader-ir.cc b/src/binary-reader-ir.cc
index cceeba3d..b1c341b0 100644
--- a/src/binary-reader-ir.cc
+++ b/src/binary-reader-ir.cc
@@ -52,11 +52,12 @@ class BinaryReaderIR : public BinaryReaderNop {
bool OnError(const Error&) override;
Result OnTypeCount(Index count) override;
- Result OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) override;
+ Result OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) override;
+ Result OnStructType(Index index) override;
Result OnImportCount(Index count) override;
Result OnImportFunc(Index import_index,
@@ -384,15 +385,24 @@ Result BinaryReaderIR::OnTypeCount(Index count) {
return Result::Ok;
}
-Result BinaryReaderIR::OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) {
+Result BinaryReaderIR::OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) {
auto field = MakeUnique<TypeModuleField>(GetLocation());
- FuncType& func_type = *cast<FuncType>(field->type.get());
- func_type.sig.param_types.assign(param_types, param_types + param_count);
- func_type.sig.result_types.assign(result_types, result_types + result_count);
+ auto func_type = MakeUnique<FuncType>();
+ func_type->sig.param_types.assign(param_types, param_types + param_count);
+ func_type->sig.result_types.assign(result_types, result_types + result_count);
+ field->type = std::move(func_type);
+ module_->AppendField(std::move(field));
+ return Result::Ok;
+}
+
+Result BinaryReaderIR::OnStructType(Index index) {
+ auto field = MakeUnique<TypeModuleField>(GetLocation());
+ auto struct_type = MakeUnique<StructType>();
+ field->type = std::move(struct_type);
module_->AppendField(std::move(field));
return Result::Ok;
}
diff --git a/src/binary-reader-logging.cc b/src/binary-reader-logging.cc
index 4a12dd48..dfb535e3 100644
--- a/src/binary-reader-logging.cc
+++ b/src/binary-reader-logging.cc
@@ -128,18 +128,24 @@ Result BinaryReaderLogging::BeginCustomSection(Offset size,
return reader_->BeginCustomSection(size, section_name);
}
-Result BinaryReaderLogging::OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) {
+Result BinaryReaderLogging::OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) {
+ // TODO: switch to "OnFuncType"?
LOGF("OnType(index: %" PRIindex ", params: ", index);
LogTypes(param_count, param_types);
LOGF_NOINDENT(", results: ");
LogTypes(result_count, result_types);
LOGF_NOINDENT(")\n");
- return reader_->OnType(index, param_count, param_types, result_count,
- result_types);
+ return reader_->OnFuncType(index, param_count, param_types, result_count,
+ result_types);
+}
+
+Result BinaryReaderLogging::OnStructType(Index index) {
+ LOGF("OnStructType(index: %" PRIindex ")\n", index);
+ return reader_->OnStructType(index);
}
Result BinaryReaderLogging::OnImport(Index index,
diff --git a/src/binary-reader-logging.h b/src/binary-reader-logging.h
index facc8d5d..214d8bae 100644
--- a/src/binary-reader-logging.h
+++ b/src/binary-reader-logging.h
@@ -42,11 +42,12 @@ class BinaryReaderLogging : public BinaryReaderDelegate {
Result BeginTypeSection(Offset size) override;
Result OnTypeCount(Index count) override;
- Result OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) override;
+ Result OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) override;
+ Result OnStructType(Index index) override;
Result EndTypeSection() override;
Result BeginImportSection(Offset size) override;
diff --git a/src/binary-reader-nop.h b/src/binary-reader-nop.h
index 0124858c..e9b1eb22 100644
--- a/src/binary-reader-nop.h
+++ b/src/binary-reader-nop.h
@@ -44,13 +44,14 @@ class BinaryReaderNop : public BinaryReaderDelegate {
/* Type section */
Result BeginTypeSection(Offset size) override { return Result::Ok; }
Result OnTypeCount(Index count) override { return Result::Ok; }
- Result OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) override {
+ Result OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) override {
return Result::Ok;
}
+ Result OnStructType(Index index) override { return Result::Ok; }
Result EndTypeSection() override { return Result::Ok; }
/* Import section */
diff --git a/src/binary-reader-objdump.cc b/src/binary-reader-objdump.cc
index 61398d2d..e5bfcfe9 100644
--- a/src/binary-reader-objdump.cc
+++ b/src/binary-reader-objdump.cc
@@ -726,11 +726,11 @@ class BinaryReaderObjdump : public BinaryReaderObjdumpBase {
Result BeginCustomSection(Offset size, string_view section_name) override;
Result OnTypeCount(Index count) override;
- Result OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) override;
+ Result OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) override;
Result OnImportCount(Index count) override;
Result OnImportFunc(Index import_index,
@@ -1029,11 +1029,11 @@ Result BinaryReaderObjdump::OnTypeCount(Index count) {
return OnCount(count);
}
-Result BinaryReaderObjdump::OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) {
+Result BinaryReaderObjdump::OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) {
if (!ShouldPrintDetails()) {
return Result::Ok;
}
diff --git a/src/binary-reader.cc b/src/binary-reader.cc
index 8661b9f7..2a28a569 100644
--- a/src/binary-reader.cc
+++ b/src/binary-reader.cc
@@ -1951,44 +1951,60 @@ Result BinaryReader::ReadTypeSection(Offset section_size) {
for (Index i = 0; i < num_signatures_; ++i) {
Type form;
CHECK_RESULT(ReadType(&form, "type form"));
- ERROR_UNLESS(form == Type::Func,
- "unexpected type form (got " PRItypecode ")",
- WABT_PRINTF_TYPE_CODE(form));
-
- Index num_params;
- CHECK_RESULT(ReadCount(&num_params, "function param count"));
-
- param_types_.resize(num_params);
-
- for (Index j = 0; j < num_params; ++j) {
- Type param_type;
- CHECK_RESULT(ReadType(&param_type, "function param type"));
- ERROR_UNLESS(IsConcreteType(param_type),
- "expected valid param type (got " PRItypecode ")",
- WABT_PRINTF_TYPE_CODE(param_type));
- param_types_[j] = param_type;
- }
- Index num_results;
- CHECK_RESULT(ReadCount(&num_results, "function result count"));
- ERROR_UNLESS(num_results <= 1 || options_.features.multi_value_enabled(),
- "result count must be 0 or 1");
+ switch (form) {
+ case Type::Func: {
+ Index num_params;
+ CHECK_RESULT(ReadCount(&num_params, "function param count"));
- result_types_.resize(num_results);
+ param_types_.resize(num_params);
- for (Index j = 0; j < num_results; ++j) {
- Type result_type;
- CHECK_RESULT(ReadType(&result_type, "function result type"));
- ERROR_UNLESS(IsConcreteType(result_type),
- "expected valid result type (got " PRItypecode ")",
- WABT_PRINTF_TYPE_CODE(result_type));
- result_types_[j] = result_type;
- }
+ for (Index j = 0; j < num_params; ++j) {
+ Type param_type;
+ CHECK_RESULT(ReadType(&param_type, "function param type"));
+ ERROR_UNLESS(IsConcreteType(param_type),
+ "expected valid param type (got " PRItypecode ")",
+ WABT_PRINTF_TYPE_CODE(param_type));
+ param_types_[j] = param_type;
+ }
- Type* param_types = num_params ? param_types_.data() : nullptr;
- Type* result_types = num_results ? result_types_.data() : nullptr;
+ Index num_results;
+ CHECK_RESULT(ReadCount(&num_results, "function result count"));
+ ERROR_UNLESS(
+ num_results <= 1 || options_.features.multi_value_enabled(),
+ "result count must be 0 or 1");
+
+ result_types_.resize(num_results);
+
+ for (Index j = 0; j < num_results; ++j) {
+ Type result_type;
+ CHECK_RESULT(ReadType(&result_type, "function result type"));
+ ERROR_UNLESS(IsConcreteType(result_type),
+ "expected valid result type (got " PRItypecode ")",
+ WABT_PRINTF_TYPE_CODE(result_type));
+ result_types_[j] = result_type;
+ }
- CALLBACK(OnType, i, num_params, param_types, num_results, result_types);
+ Type* param_types = num_params ? param_types_.data() : nullptr;
+ Type* result_types = num_results ? result_types_.data() : nullptr;
+
+ CALLBACK(OnFuncType, i, num_params, param_types, num_results,
+ result_types);
+ break;
+ }
+
+ case Type::Struct:
+ // TODO
+ ERROR_UNLESS(options_.features.gc_enabled(),
+ "invalid type form: struct not allowed");
+ CALLBACK(OnStructType, i);
+ break;
+
+ default:
+ PrintError("unexpected type form (got " PRItypecode ")",
+ WABT_PRINTF_TYPE_CODE(form));
+ return Result::Error;
+ }
}
CALLBACK0(EndTypeSection);
return Result::Ok;
diff --git a/src/binary-reader.h b/src/binary-reader.h
index 67e2c80c..23c25827 100644
--- a/src/binary-reader.h
+++ b/src/binary-reader.h
@@ -82,11 +82,12 @@ class BinaryReaderDelegate {
/* Type section */
virtual Result BeginTypeSection(Offset size) = 0;
virtual Result OnTypeCount(Index count) = 0;
- virtual Result OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) = 0;
+ virtual Result OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) = 0;
+ virtual Result OnStructType(Index index) = 0; // TODO
virtual Result EndTypeSection() = 0;
/* Import section */
diff --git a/src/binary-writer.cc b/src/binary-writer.cc
index ab4d96ea..3f45863a 100644
--- a/src/binary-writer.cc
+++ b/src/binary-writer.cc
@@ -880,21 +880,33 @@ Result BinaryWriter::WriteModule() {
BeginKnownSection(BinarySection::Type);
WriteU32Leb128(stream_, module_->types.size(), "num types");
for (size_t i = 0; i < module_->types.size(); ++i) {
- const FuncType* func_type = cast<FuncType>(module_->types[i]);
- const FuncSignature* sig = &func_type->sig;
- WriteHeader("type", i);
- WriteType(stream_, Type::Func);
-
- Index num_params = sig->param_types.size();
- Index num_results = sig->result_types.size();
- WriteU32Leb128(stream_, num_params, "num params");
- for (size_t j = 0; j < num_params; ++j) {
- WriteType(stream_, sig->param_types[j]);
- }
+ const TypeEntry* type = module_->types[i];
+ switch (type->kind()) {
+ case TypeEntryKind::Func: {
+ const FuncType* func_type = cast<FuncType>(type);
+ const FuncSignature* sig = &func_type->sig;
+ WriteHeader("type", i); // TODO: switch to "func type"?
+ WriteType(stream_, Type::Func);
+
+ Index num_params = sig->param_types.size();
+ Index num_results = sig->result_types.size();
+ WriteU32Leb128(stream_, num_params, "num params");
+ for (size_t j = 0; j < num_params; ++j) {
+ WriteType(stream_, sig->param_types[j]);
+ }
- WriteU32Leb128(stream_, num_results, "num results");
- for (size_t j = 0; j < num_results; ++j) {
- WriteType(stream_, sig->result_types[j]);
+ WriteU32Leb128(stream_, num_results, "num results");
+ for (size_t j = 0; j < num_results; ++j) {
+ WriteType(stream_, sig->result_types[j]);
+ }
+ break;
+ }
+
+ case TypeEntryKind::Struct:
+ WriteHeader("struct type", i);
+ WriteType(stream_, Type::Struct);
+ // TODO
+ break;
}
}
EndSection();
diff --git a/src/interp/binary-reader-interp.cc b/src/interp/binary-reader-interp.cc
index 1d455a66..584ddb92 100644
--- a/src/interp/binary-reader-interp.cc
+++ b/src/interp/binary-reader-interp.cc
@@ -78,11 +78,11 @@ class BinaryReaderInterp : public BinaryReaderNop {
Result EndModule() override;
Result OnTypeCount(Index count) override;
- Result OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) override;
+ Result OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) override;
Result OnImportFunc(Index import_index,
string_view module_name,
@@ -432,13 +432,13 @@ Result BinaryReaderInterp::OnTypeCount(Index count) {
return Result::Ok;
}
-Result BinaryReaderInterp::OnType(Index index,
- Index param_count,
- Type* param_types,
- Index result_count,
- Type* result_types) {
- CHECK_RESULT(validator_.OnType(loc, param_count, param_types, result_count,
- result_types));
+Result BinaryReaderInterp::OnFuncType(Index index,
+ Index param_count,
+ Type* param_types,
+ Index result_count,
+ Type* result_types) {
+ CHECK_RESULT(validator_.OnFuncType(loc, param_count, param_types,
+ result_count, result_types));
module_.func_types.push_back(FuncType(ToInterp(param_count, param_types),
ToInterp(result_count, result_types)));
return Result::Ok;
diff --git a/src/interp/interp-util.cc b/src/interp/interp-util.cc
index b12544c4..6b44dc3c 100644
--- a/src/interp/interp-util.cc
+++ b/src/interp/interp-util.cc
@@ -59,6 +59,7 @@ std::string TypedValueToString(const TypedValue& tv) {
return StringPrintf("anyref:%" PRIzd, tv.value.Get<Ref>().index);
case Type::Func:
+ case Type::Struct:
case Type::Void:
case Type::Any:
case Type::I8:
diff --git a/src/ir.cc b/src/ir.cc
index 9b7e414b..5eb511e7 100644
--- a/src/ir.cc
+++ b/src/ir.cc
@@ -319,8 +319,10 @@ FuncType* Module::GetFuncType(const Var& var) {
Index Module::GetFuncTypeIndex(const FuncSignature& sig) const {
for (size_t i = 0; i < types.size(); ++i) {
- if (cast<FuncType>(types[i])->sig == sig) {
- return i;
+ if (auto* func_type = dyn_cast<FuncType>(types[i])) {
+ if (func_type->sig == sig) {
+ return i;
+ }
}
}
return kInvalidIndex;
diff --git a/src/ir.h b/src/ir.h
index 2972c77d..d2a7a562 100644
--- a/src/ir.h
+++ b/src/ir.h
@@ -142,6 +142,7 @@ struct FuncSignature {
enum class TypeEntryKind {
Func,
+ Struct,
};
class TypeEntry {
@@ -181,6 +182,24 @@ class FuncType : public TypeEntry {
FuncSignature sig;
};
+struct Field {
+ std::string name;
+ Type type = Type::Void;
+ bool mutable_ = false;
+};
+
+class StructType : public TypeEntry {
+ public:
+ static bool classof(const TypeEntry* entry) {
+ return entry->kind() == TypeEntryKind::Struct;
+ }
+
+ explicit StructType(string_view name = string_view())
+ : TypeEntry(TypeEntryKind::Struct) {}
+
+ std::vector<Field> fields;
+};
+
struct FuncDeclaration {
Index GetNumParams() const { return sig.GetNumParams(); }
Index GetNumResults() const { return sig.GetNumResults(); }
@@ -818,10 +837,8 @@ class ExportModuleField : public ModuleFieldMixin<ModuleFieldType::Export> {
class TypeModuleField : public ModuleFieldMixin<ModuleFieldType::Type> {
public:
- explicit TypeModuleField(const Location& loc = Location(),
- string_view name = string_view())
- : ModuleFieldMixin<ModuleFieldType::Type>(loc),
- type(MakeUnique<FuncType>(name)) {}
+ explicit TypeModuleField(const Location& loc = Location())
+ : ModuleFieldMixin<ModuleFieldType::Type>(loc) {}
std::unique_ptr<TypeEntry> type;
};
diff --git a/src/lexer-keywords.txt b/src/lexer-keywords.txt
index 6f0279fd..237888d5 100644
--- a/src/lexer-keywords.txt
+++ b/src/lexer-keywords.txt
@@ -482,6 +482,7 @@ return, TokenType::Return, Opcode::Return
select, TokenType::Select, Opcode::Select
shared, TokenType::Shared
start, TokenType::Start
+struct, TokenType::Struct
table.copy, TokenType::TableCopy, Opcode::TableCopy
table.fill, TokenType::TableFill, Opcode::TableFill
table.get, TokenType::TableGet, Opcode::TableGet
diff --git a/src/prebuilt/lexer-keywords.cc b/src/prebuilt/lexer-keywords.cc
index 64ca8ac0..d2427ea9 100644
--- a/src/prebuilt/lexer-keywords.cc
+++ b/src/prebuilt/lexer-keywords.cc
@@ -46,7 +46,7 @@ struct TokenInfo {
Opcode opcode;
};
};
-/* maximum key range = 1878, duplicates = 0 */
+/* maximum key range = 2098, duplicates = 0 */
class Perfect_Hash
{
@@ -61,32 +61,32 @@ Perfect_Hash::hash (const char *str, size_t len)
{
static unsigned short asso_values[] =
{
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 5, 26, 1884, 150,
- 2, 110, 1, 413, 128, 134, 74, 478, 8, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 4, 1, 92, 36, 66,
- 18, 8, 1, 351, 512, 6, 52, 12, 26, 9,
- 11, 44, 263, 332, 71, 1, 1, 3, 80, 2,
- 441, 537, 167, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884, 1884,
- 1884, 1884, 1884, 1884, 1884, 1884, 1884
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 16, 87, 2101, 13,
+ 1, 135, 0, 381, 146, 217, 59, 531, 32, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 6, 3, 43, 30, 102,
+ 17, 7, 0, 369, 631, 5, 15, 0, 21, 6,
+ 6, 65, 439, 306, 36, 1, 1, 3, 99, 7,
+ 508, 484, 117, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101, 2101,
+ 2101, 2101, 2101, 2101, 2101, 2101, 2101
};
unsigned int hval = len;
@@ -150,24 +150,24 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{
enum
{
- TOTAL_KEYWORDS = 535,
+ TOTAL_KEYWORDS = 536,
MIN_WORD_LENGTH = 2,
MAX_WORD_LENGTH = 26,
- MIN_HASH_VALUE = 6,
- MAX_HASH_VALUE = 1883
+ MIN_HASH_VALUE = 3,
+ MAX_HASH_VALUE = 2100
};
static struct TokenInfo wordlist[] =
{
- {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
#line 126 "src/lexer-keywords.txt"
{"f64", Type::F64},
{""},
#line 75 "src/lexer-keywords.txt"
{"f32", Type::F32},
+ {""},
#line 448 "src/lexer-keywords.txt"
{"if", TokenType::If, Opcode::If},
- {""},
#line 399 "src/lexer-keywords.txt"
{"i64", Type::I64},
{""},
@@ -175,39 +175,42 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"i32", Type::I32},
#line 464 "src/lexer-keywords.txt"
{"mut", TokenType::Mut},
- {""}, {""}, {""}, {""},
+ {""}, {""},
#line 113 "src/lexer-keywords.txt"
{"f64.lt", TokenType::Compare, Opcode::F64Lt},
#line 63 "src/lexer-keywords.txt"
{"f32.lt", TokenType::Compare, Opcode::F32Lt},
-#line 42 "src/lexer-keywords.txt"
- {"else", TokenType::Else, Opcode::Else},
{""}, {""},
-#line 493 "src/lexer-keywords.txt"
+#line 494 "src/lexer-keywords.txt"
{"then", TokenType::Then},
-#line 44 "src/lexer-keywords.txt"
- {"event", TokenType::Event},
+#line 42 "src/lexer-keywords.txt"
+ {"else", TokenType::Else, Opcode::Else},
{""},
+#line 146 "src/lexer-keywords.txt"
+ {"funcref", Type::Funcref},
#line 451 "src/lexer-keywords.txt"
{"item", TokenType::Item},
- {""},
+#line 44 "src/lexer-keywords.txt"
+ {"event", TokenType::Event},
#line 41 "src/lexer-keywords.txt"
{"elem", TokenType::Elem},
-#line 146 "src/lexer-keywords.txt"
- {"funcref", Type::Funcref},
-#line 372 "src/lexer-keywords.txt"
- {"i64.lt_s", TokenType::Compare, Opcode::I64LtS},
-#line 244 "src/lexer-keywords.txt"
- {"i32.lt_s", TokenType::Compare, Opcode::I32LtS},
+ {""},
#line 111 "src/lexer-keywords.txt"
{"f64.le", TokenType::Compare, Opcode::F64Le},
#line 61 "src/lexer-keywords.txt"
{"f32.le", TokenType::Compare, Opcode::F32Le},
+#line 372 "src/lexer-keywords.txt"
+ {"i64.lt_s", TokenType::Compare, Opcode::I64LtS},
+#line 244 "src/lexer-keywords.txt"
+ {"i32.lt_s", TokenType::Compare, Opcode::I32LtS},
+#line 115 "src/lexer-keywords.txt"
+ {"f64.min", TokenType::Binary, Opcode::F64Min},
+#line 65 "src/lexer-keywords.txt"
+ {"f32.min", TokenType::Binary, Opcode::F32Min},
#line 373 "src/lexer-keywords.txt"
{"i64.lt_u", TokenType::Compare, Opcode::I64LtU},
#line 245 "src/lexer-keywords.txt"
{"i32.lt_u", TokenType::Compare, Opcode::I32LtU},
- {""},
#line 363 "src/lexer-keywords.txt"
{"i64.le_s", TokenType::Compare, Opcode::I64LeS},
#line 237 "src/lexer-keywords.txt"
@@ -224,52 +227,46 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"i64.rem_u", TokenType::Binary, Opcode::I64RemU},
#line 252 "src/lexer-keywords.txt"
{"i32.rem_u", TokenType::Binary, Opcode::I32RemU},
- {""},
+#line 468 "src/lexer-keywords.txt"
+ {"nullref", Type::Nullref},
+#line 493 "src/lexer-keywords.txt"
+ {"table", TokenType::Table},
#line 43 "src/lexer-keywords.txt"
{"end", TokenType::End, Opcode::End},
-#line 115 "src/lexer-keywords.txt"
- {"f64.min", TokenType::Binary, Opcode::F64Min},
-#line 65 "src/lexer-keywords.txt"
- {"f32.min", TokenType::Binary, Opcode::F32Min},
- {""},
-#line 492 "src/lexer-keywords.txt"
- {"table", TokenType::Table},
- {""},
+ {""}, {""},
#line 482 "src/lexer-keywords.txt"
{"select", TokenType::Select, Opcode::Select},
-#line 469 "src/lexer-keywords.txt"
- {"offset", TokenType::Offset},
-#line 468 "src/lexer-keywords.txt"
- {"nullref", Type::Nullref},
- {""}, {""},
+ {""},
#line 463 "src/lexer-keywords.txt"
{"module", TokenType::Module},
- {""}, {""}, {""}, {""},
-#line 490 "src/lexer-keywords.txt"
- {"table.set", TokenType::TableSet, Opcode::TableSet},
- {""}, {""}, {""}, {""},
-#line 119 "src/lexer-keywords.txt"
- {"f64.ne", TokenType::Compare, Opcode::F64Ne},
-#line 69 "src/lexer-keywords.txt"
- {"f32.ne", TokenType::Compare, Opcode::F32Ne},
- {""}, {""}, {""},
-#line 375 "src/lexer-keywords.txt"
- {"i64.ne", TokenType::Compare, Opcode::I64Ne},
-#line 247 "src/lexer-keywords.txt"
- {"i32.ne", TokenType::Compare, Opcode::I32Ne},
+ {""},
+#line 477 "src/lexer-keywords.txt"
+ {"result", TokenType::Result},
+ {""},
+#line 484 "src/lexer-keywords.txt"
+ {"start", TokenType::Start},
+ {""}, {""},
+#line 481 "src/lexer-keywords.txt"
+ {"return", TokenType::Return, Opcode::Return},
+ {""},
#line 116 "src/lexer-keywords.txt"
{"f64.mul", TokenType::Binary, Opcode::F64Mul},
#line 66 "src/lexer-keywords.txt"
{"f32.mul", TokenType::Binary, Opcode::F32Mul},
-#line 489 "src/lexer-keywords.txt"
- {"table.init", TokenType::TableInit, Opcode::TableInit},
{""}, {""},
+#line 485 "src/lexer-keywords.txt"
+ {"struct", TokenType::Struct},
#line 374 "src/lexer-keywords.txt"
{"i64.mul", TokenType::Binary, Opcode::I64Mul},
#line 246 "src/lexer-keywords.txt"
{"i32.mul", TokenType::Binary, Opcode::I32Mul},
-#line 147 "src/lexer-keywords.txt"
- {"func", TokenType::Func},
+#line 37 "src/lexer-keywords.txt"
+ {"data", TokenType::Data},
+#line 491 "src/lexer-keywords.txt"
+ {"table.set", TokenType::TableSet, Opcode::TableSet},
+ {""},
+#line 31 "src/lexer-keywords.txt"
+ {"br", TokenType::Br, Opcode::Br},
#line 97 "src/lexer-keywords.txt"
{"f64.abs", TokenType::Unary, Opcode::F64Abs},
#line 46 "src/lexer-keywords.txt"
@@ -278,20 +275,16 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"f64.sub", TokenType::Binary, Opcode::F64Sub},
#line 73 "src/lexer-keywords.txt"
{"f32.sub", TokenType::Binary, Opcode::F32Sub},
-#line 100 "src/lexer-keywords.txt"
- {"f64.const", TokenType::Const, Opcode::F64Const},
-#line 49 "src/lexer-keywords.txt"
- {"f32.const", TokenType::Const, Opcode::F32Const},
-#line 477 "src/lexer-keywords.txt"
- {"result", TokenType::Result},
+#line 469 "src/lexer-keywords.txt"
+ {"offset", TokenType::Offset},
+#line 490 "src/lexer-keywords.txt"
+ {"table.init", TokenType::TableInit, Opcode::TableInit},
+ {""},
#line 390 "src/lexer-keywords.txt"
{"i64.sub", TokenType::Binary, Opcode::I64Sub},
#line 261 "src/lexer-keywords.txt"
{"i32.sub", TokenType::Binary, Opcode::I32Sub},
-#line 348 "src/lexer-keywords.txt"
- {"i64.const", TokenType::Const, Opcode::I64Const},
-#line 225 "src/lexer-keywords.txt"
- {"i32.const", TokenType::Const, Opcode::I32Const},
+ {""},
#line 99 "src/lexer-keywords.txt"
{"f64.ceil", TokenType::Unary, Opcode::F64Ceil},
#line 48 "src/lexer-keywords.txt"
@@ -301,236 +294,273 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"i64.and", TokenType::Binary, Opcode::I64And},
#line 195 "src/lexer-keywords.txt"
{"i32.and", TokenType::Binary, Opcode::I32And},
+#line 483 "src/lexer-keywords.txt"
+ {"shared", TokenType::Shared},
+#line 119 "src/lexer-keywords.txt"
+ {"f64.ne", TokenType::Compare, Opcode::F64Ne},
+#line 69 "src/lexer-keywords.txt"
+ {"f32.ne", TokenType::Compare, Opcode::F32Ne},
+ {""},
#line 98 "src/lexer-keywords.txt"
{"f64.add", TokenType::Binary, Opcode::F64Add},
#line 47 "src/lexer-keywords.txt"
{"f32.add", TokenType::Binary, Opcode::F32Add},
-#line 481 "src/lexer-keywords.txt"
- {"return", TokenType::Return, Opcode::Return},
-#line 484 "src/lexer-keywords.txt"
- {"start", TokenType::Start},
+#line 375 "src/lexer-keywords.txt"
+ {"i64.ne", TokenType::Compare, Opcode::I64Ne},
+#line 247 "src/lexer-keywords.txt"
+ {"i32.ne", TokenType::Compare, Opcode::I32Ne},
{""},
#line 308 "src/lexer-keywords.txt"
{"i64.add", TokenType::Binary, Opcode::I64Add},
#line 194 "src/lexer-keywords.txt"
{"i32.add", TokenType::Binary, Opcode::I32Add},
- {""}, {""}, {""},
-#line 31 "src/lexer-keywords.txt"
- {"br", TokenType::Br, Opcode::Br},
+ {""}, {""}, {""}, {""}, {""},
+#line 100 "src/lexer-keywords.txt"
+ {"f64.const", TokenType::Const, Opcode::F64Const},
+#line 49 "src/lexer-keywords.txt"
+ {"f32.const", TokenType::Const, Opcode::F32Const},
{""}, {""},
-#line 486 "src/lexer-keywords.txt"
+#line 487 "src/lexer-keywords.txt"
{"table.fill", TokenType::TableFill, Opcode::TableFill},
+#line 348 "src/lexer-keywords.txt"
+ {"i64.const", TokenType::Const, Opcode::I64Const},
+#line 225 "src/lexer-keywords.txt"
+ {"i32.const", TokenType::Const, Opcode::I32Const},
+ {""}, {""}, {""}, {""}, {""},
+#line 147 "src/lexer-keywords.txt"
+ {"func", TokenType::Func},
+ {""}, {""}, {""}, {""},
+#line 473 "src/lexer-keywords.txt"
+ {"ref.host", TokenType::RefHost},
+ {""}, {""},
+#line 474 "src/lexer-keywords.txt"
+ {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull},
+#line 27 "src/lexer-keywords.txt"
+ {"block", TokenType::Block, Opcode::Block},
#line 381 "src/lexer-keywords.txt"
{"i64.rotl", TokenType::Binary, Opcode::I64Rotl},
#line 253 "src/lexer-keywords.txt"
{"i32.rotl", TokenType::Binary, Opcode::I32Rotl},
-#line 37 "src/lexer-keywords.txt"
- {"data", TokenType::Data},
-#line 350 "src/lexer-keywords.txt"
- {"i64.div_s", TokenType::Binary, Opcode::I64DivS},
-#line 227 "src/lexer-keywords.txt"
- {"i32.div_s", TokenType::Binary, Opcode::I32DivS},
- {""},
-#line 145 "src/lexer-keywords.txt"
- {"f64x2", TokenType::F64X2},
-#line 351 "src/lexer-keywords.txt"
- {"i64.div_u", TokenType::Binary, Opcode::I64DivU},
-#line 228 "src/lexer-keywords.txt"
- {"i32.div_u", TokenType::Binary, Opcode::I32DivU},
-#line 33 "src/lexer-keywords.txt"
- {"call", TokenType::Call, Opcode::Call},
-#line 27 "src/lexer-keywords.txt"
- {"block", TokenType::Block, Opcode::Block},
-#line 412 "src/lexer-keywords.txt"
- {"i64x2", TokenType::I64X2},
- {""},
-#line 453 "src/lexer-keywords.txt"
- {"local.set", TokenType::LocalSet, Opcode::LocalSet},
- {""},
#line 478 "src/lexer-keywords.txt"
{"rethrow", TokenType::Rethrow, Opcode::Rethrow},
- {""}, {""}, {""},
-#line 455 "src/lexer-keywords.txt"
- {"local", TokenType::Local},
-#line 473 "src/lexer-keywords.txt"
- {"ref.host", TokenType::RefHost},
-#line 450 "src/lexer-keywords.txt"
- {"invoke", TokenType::Invoke},
{""},
-#line 483 "src/lexer-keywords.txt"
- {"shared", TokenType::Shared},
- {""}, {""}, {""},
-#line 454 "src/lexer-keywords.txt"
- {"local.tee", TokenType::LocalTee, Opcode::LocalTee},
- {""}, {""}, {""},
#line 123 "src/lexer-keywords.txt"
{"f64.store", TokenType::Store, Opcode::F64Store},
#line 72 "src/lexer-keywords.txt"
{"f32.store", TokenType::Store, Opcode::F32Store},
- {""},
#line 387 "src/lexer-keywords.txt"
{"i64.store32", TokenType::Store, Opcode::I64Store32},
- {""},
+ {""}, {""},
#line 389 "src/lexer-keywords.txt"
{"i64.store", TokenType::Store, Opcode::I64Store},
#line 260 "src/lexer-keywords.txt"
{"i32.store", TokenType::Store, Opcode::I32Store},
- {""},
-#line 140 "src/lexer-keywords.txt"
- {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne},
-#line 135 "src/lexer-keywords.txt"
- {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 506 "src/lexer-keywords.txt"
- {"v128", Type::V128},
- {""},
+#line 350 "src/lexer-keywords.txt"
+ {"i64.div_s", TokenType::Binary, Opcode::I64DivS},
+#line 227 "src/lexer-keywords.txt"
+ {"i32.div_s", TokenType::Binary, Opcode::I32DivS},
+ {""}, {""},
+#line 351 "src/lexer-keywords.txt"
+ {"i64.div_u", TokenType::Binary, Opcode::I64DivU},
+#line 228 "src/lexer-keywords.txt"
+ {"i32.div_u", TokenType::Binary, Opcode::I32DivU},
#line 30 "src/lexer-keywords.txt"
{"br_table", TokenType::BrTable, Opcode::BrTable},
-#line 137 "src/lexer-keywords.txt"
- {"f64x2.min", TokenType::Binary, Opcode::F64X2Min},
+ {""},
+#line 145 "src/lexer-keywords.txt"
+ {"f64x2", TokenType::F64X2},
{""}, {""}, {""},
-#line 134 "src/lexer-keywords.txt"
- {"f64x2.le", TokenType::Compare, Opcode::F64X2Le},
- {""}, {""}, {""}, {""}, {""},
-#line 503 "src/lexer-keywords.txt"
- {"v128.not", TokenType::Unary, Opcode::V128Not},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 106 "src/lexer-keywords.txt"
- {"f64.div", TokenType::Binary, Opcode::F64Div},
-#line 56 "src/lexer-keywords.txt"
- {"f32.div", TokenType::Binary, Opcode::F32Div},
-#line 343 "src/lexer-keywords.txt"
- {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32},
-#line 345 "src/lexer-keywords.txt"
- {"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore},
-#line 222 "src/lexer-keywords.txt"
- {"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore},
- {""}, {""},
-#line 138 "src/lexer-keywords.txt"
- {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul},
+#line 450 "src/lexer-keywords.txt"
+ {"invoke", TokenType::Invoke},
+#line 412 "src/lexer-keywords.txt"
+ {"i64x2", TokenType::I64X2},
+ {""},
+#line 33 "src/lexer-keywords.txt"
+ {"call", TokenType::Call, Opcode::Call},
+ {""}, {""}, {""},
+#line 382 "src/lexer-keywords.txt"
+ {"i64.rotr", TokenType::Binary, Opcode::I64Rotr},
+#line 254 "src/lexer-keywords.txt"
+ {"i32.rotr", TokenType::Binary, Opcode::I32Rotr},
+ {""},
+#line 455 "src/lexer-keywords.txt"
+ {"local", TokenType::Local},
#line 112 "src/lexer-keywords.txt"
{"f64.load", TokenType::Load, Opcode::F64Load},
#line 62 "src/lexer-keywords.txt"
{"f32.load", TokenType::Load, Opcode::F32Load},
- {""}, {""},
-#line 404 "src/lexer-keywords.txt"
- {"i64x2.mul", TokenType::Binary, Opcode::I64X2Mul},
+ {""},
+#line 22 "src/lexer-keywords.txt"
+ {"assert_return", TokenType::AssertReturn},
+#line 24 "src/lexer-keywords.txt"
+ {"assert_unlinkable", TokenType::AssertUnlinkable},
#line 371 "src/lexer-keywords.txt"
{"i64.load", TokenType::Load, Opcode::I64Load},
#line 243 "src/lexer-keywords.txt"
{"i32.load", TokenType::Load, Opcode::I32Load},
+#line 507 "src/lexer-keywords.txt"
+ {"v128", Type::V128},
+#line 453 "src/lexer-keywords.txt"
+ {"local.set", TokenType::LocalSet, Opcode::LocalSet},
{""}, {""}, {""}, {""},
-#line 144 "src/lexer-keywords.txt"
- {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub},
-#line 382 "src/lexer-keywords.txt"
- {"i64.rotr", TokenType::Binary, Opcode::I64Rotr},
-#line 254 "src/lexer-keywords.txt"
- {"i32.rotr", TokenType::Binary, Opcode::I32Rotr},
+#line 365 "src/lexer-keywords.txt"
+ {"i64.load16_s", TokenType::Load, Opcode::I64Load16S},
+#line 239 "src/lexer-keywords.txt"
+ {"i32.load16_s", TokenType::Load, Opcode::I32Load16S},
+#line 117 "src/lexer-keywords.txt"
+ {"f64.nearest", TokenType::Unary, Opcode::F64Nearest},
+#line 67 "src/lexer-keywords.txt"
+ {"f32.nearest", TokenType::Unary, Opcode::F32Nearest},
+#line 366 "src/lexer-keywords.txt"
+ {"i64.load16_u", TokenType::Load, Opcode::I64Load16U},
+#line 240 "src/lexer-keywords.txt"
+ {"i32.load16_u", TokenType::Load, Opcode::I32Load16U},
#line 475 "src/lexer-keywords.txt"
{"ref.null", TokenType::RefNull, Opcode::RefNull},
-#line 474 "src/lexer-keywords.txt"
- {"ref.is_null", TokenType::RefIsNull, Opcode::RefIsNull},
-#line 411 "src/lexer-keywords.txt"
- {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 38 "src/lexer-keywords.txt"
- {"declare", TokenType::Declare},
+#line 454 "src/lexer-keywords.txt"
+ {"local.tee", TokenType::LocalTee, Opcode::LocalTee},
+ {""}, {""},
+#line 140 "src/lexer-keywords.txt"
+ {"f64x2.ne", TokenType::Compare, Opcode::F64X2Ne},
+#line 20 "src/lexer-keywords.txt"
+ {"assert_invalid", TokenType::AssertInvalid},
{""},
+#line 135 "src/lexer-keywords.txt"
+ {"f64x2.lt", TokenType::Compare, Opcode::F64X2Lt},
+#line 137 "src/lexer-keywords.txt"
+ {"f64x2.min", TokenType::Binary, Opcode::F64X2Min},
#line 388 "src/lexer-keywords.txt"
{"i64.store8", TokenType::Store, Opcode::I64Store8},
#line 259 "src/lexer-keywords.txt"
{"i32.store8", TokenType::Store, Opcode::I32Store8},
+ {""},
+#line 492 "src/lexer-keywords.txt"
+ {"table.size", TokenType::TableSize, Opcode::TableSize},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 134 "src/lexer-keywords.txt"
+ {"f64x2.le", TokenType::Compare, Opcode::F64X2Le},
{""}, {""}, {""}, {""},
-#line 55 "src/lexer-keywords.txt"
- {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64},
-#line 32 "src/lexer-keywords.txt"
- {"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect},
#line 346 "src/lexer-keywords.txt"
{"i64.atomic.wait", TokenType::AtomicWait, Opcode::I64AtomicWait},
#line 223 "src/lexer-keywords.txt"
{"i32.atomic.wait", TokenType::AtomicWait, Opcode::I32AtomicWait},
{""}, {""}, {""}, {""}, {""},
-#line 125 "src/lexer-keywords.txt"
- {"f64.trunc", TokenType::Unary, Opcode::F64Trunc},
-#line 74 "src/lexer-keywords.txt"
- {"f32.trunc", TokenType::Unary, Opcode::F32Trunc},
- {""}, {""},
-#line 491 "src/lexer-keywords.txt"
- {"table.size", TokenType::TableSize, Opcode::TableSize},
- {""}, {""},
-#line 117 "src/lexer-keywords.txt"
- {"f64.nearest", TokenType::Unary, Opcode::F64Nearest},
-#line 67 "src/lexer-keywords.txt"
- {"f32.nearest", TokenType::Unary, Opcode::F32Nearest},
- {""},
-#line 501 "src/lexer-keywords.txt"
- {"v128.const", TokenType::Const, Opcode::V128Const},
- {""},
-#line 505 "src/lexer-keywords.txt"
- {"v128.store", TokenType::Store, Opcode::V128Store},
-#line 520 "src/lexer-keywords.txt"
- {"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64},
- {""}, {""},
-#line 325 "src/lexer-keywords.txt"
- {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU},
- {""}, {""}, {""}, {""}, {""},
-#line 498 "src/lexer-keywords.txt"
- {"v128.andnot", TokenType::Binary, Opcode::V128Andnot},
+#line 38 "src/lexer-keywords.txt"
+ {"declare", TokenType::Declare},
{""},
-#line 499 "src/lexer-keywords.txt"
- {"v128.and", TokenType::Binary, Opcode::V128And},
-#line 127 "src/lexer-keywords.txt"
- {"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs},
#line 369 "src/lexer-keywords.txt"
{"i64.load8_s", TokenType::Load, Opcode::I64Load8S},
#line 241 "src/lexer-keywords.txt"
{"i32.load8_s", TokenType::Load, Opcode::I32Load8S},
-#line 332 "src/lexer-keywords.txt"
- {"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU},
-#line 210 "src/lexer-keywords.txt"
- {"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU},
+ {""},
+#line 138 "src/lexer-keywords.txt"
+ {"f64x2.mul", TokenType::Binary, Opcode::F64X2Mul},
#line 370 "src/lexer-keywords.txt"
{"i64.load8_u", TokenType::Load, Opcode::I64Load8U},
#line 242 "src/lexer-keywords.txt"
{"i32.load8_u", TokenType::Load, Opcode::I32Load8U},
+ {""}, {""},
+#line 404 "src/lexer-keywords.txt"
+ {"i64x2.mul", TokenType::Binary, Opcode::I64X2Mul},
+#line 106 "src/lexer-keywords.txt"
+ {"f64.div", TokenType::Binary, Opcode::F64Div},
+#line 56 "src/lexer-keywords.txt"
+ {"f32.div", TokenType::Binary, Opcode::F32Div},
+ {""}, {""}, {""},
+#line 343 "src/lexer-keywords.txt"
+ {"i64.atomic.store32", TokenType::AtomicStore, Opcode::I64AtomicStore32},
+ {""},
+#line 144 "src/lexer-keywords.txt"
+ {"f64x2.sub", TokenType::Binary, Opcode::F64X2Sub},
+#line 345 "src/lexer-keywords.txt"
+ {"i64.atomic.store", TokenType::AtomicStore, Opcode::I64AtomicStore},
+#line 222 "src/lexer-keywords.txt"
+ {"i32.atomic.store", TokenType::AtomicStore, Opcode::I32AtomicStore},
+ {""}, {""},
+#line 411 "src/lexer-keywords.txt"
+ {"i64x2.sub", TokenType::Binary, Opcode::I64X2Sub},
{""}, {""}, {""}, {""}, {""},
-#line 500 "src/lexer-keywords.txt"
- {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect},
+#line 127 "src/lexer-keywords.txt"
+ {"f64x2.abs", TokenType::Unary, Opcode::F64X2Abs},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
+#line 480 "src/lexer-keywords.txt"
+ {"return_call", TokenType::ReturnCall, Opcode::ReturnCall},
+ {""}, {""},
+#line 332 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8SubU},
+#line 210 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw8.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8SubU},
+#line 55 "src/lexer-keywords.txt"
+ {"f32.demote_f64", TokenType::Convert, Opcode::F32DemoteF64},
#line 128 "src/lexer-keywords.txt"
{"f64x2.add", TokenType::Binary, Opcode::F64X2Add},
- {""},
-#line 552 "src/lexer-keywords.txt"
- {"set_local", TokenType::LocalSet, Opcode::LocalSet},
- {""},
-#line 496 "src/lexer-keywords.txt"
- {"type", TokenType::Type},
+ {""}, {""}, {""},
+#line 21 "src/lexer-keywords.txt"
+ {"assert_malformed", TokenType::AssertMalformed},
#line 400 "src/lexer-keywords.txt"
{"i64x2.add", TokenType::Binary, Opcode::I64X2Add},
-#line 449 "src/lexer-keywords.txt"
- {"import", TokenType::Import},
{""},
-#line 45 "src/lexer-keywords.txt"
- {"export", TokenType::Export},
-#line 553 "src/lexer-keywords.txt"
- {"tee_local", TokenType::LocalTee, Opcode::LocalTee},
+#line 125 "src/lexer-keywords.txt"
+ {"f64.trunc", TokenType::Unary, Opcode::F64Trunc},
+#line 74 "src/lexer-keywords.txt"
+ {"f32.trunc", TokenType::Unary, Opcode::F32Trunc},
+ {""},
+#line 349 "src/lexer-keywords.txt"
+ {"i64.ctz", TokenType::Unary, Opcode::I64Ctz},
+#line 226 "src/lexer-keywords.txt"
+ {"i32.ctz", TokenType::Unary, Opcode::I32Ctz},
{""}, {""},
+#line 504 "src/lexer-keywords.txt"
+ {"v128.not", TokenType::Unary, Opcode::V128Not},
+#line 553 "src/lexer-keywords.txt"
+ {"set_local", TokenType::LocalSet, Opcode::LocalSet},
#line 329 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AndU},
#line 207 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AndU},
-#line 24 "src/lexer-keywords.txt"
- {"assert_unlinkable", TokenType::AssertUnlinkable},
-#line 22 "src/lexer-keywords.txt"
- {"assert_return", TokenType::AssertReturn},
+#line 499 "src/lexer-keywords.txt"
+ {"v128.andnot", TokenType::Binary, Opcode::V128Andnot},
{""}, {""},
-#line 20 "src/lexer-keywords.txt"
- {"assert_invalid", TokenType::AssertInvalid},
+#line 554 "src/lexer-keywords.txt"
+ {"tee_local", TokenType::LocalTee, Opcode::LocalTee},
+ {""}, {""},
+#line 500 "src/lexer-keywords.txt"
+ {"v128.and", TokenType::Binary, Opcode::V128And},
+#line 335 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd},
+#line 213 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd},
#line 328 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8AddU},
#line 206 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8AddU},
- {""},
+#line 32 "src/lexer-keywords.txt"
+ {"call_indirect", TokenType::CallIndirect, Opcode::CallIndirect},
+#line 347 "src/lexer-keywords.txt"
+ {"i64.clz", TokenType::Unary, Opcode::I64Clz},
+#line 224 "src/lexer-keywords.txt"
+ {"i32.clz", TokenType::Unary, Opcode::I32Clz},
+ {""}, {""}, {""},
+#line 313 "src/lexer-keywords.txt"
+ {"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad},
+#line 198 "src/lexer-keywords.txt"
+ {"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad},
+#line 367 "src/lexer-keywords.txt"
+ {"i64.load32_s", TokenType::Load, Opcode::I64Load32S},
+ {""}, {""},
+#line 325 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw32.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32SubU},
+#line 368 "src/lexer-keywords.txt"
+ {"i64.load32_u", TokenType::Load, Opcode::I64Load32U},
+#line 338 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr},
+#line 216 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 506 "src/lexer-keywords.txt"
+ {"v128.store", TokenType::Store, Opcode::V128Store},
+ {""}, {""}, {""}, {""}, {""},
#line 391 "src/lexer-keywords.txt"
{"i64.trunc_f32_s", TokenType::Convert, Opcode::I64TruncF32S},
#line 262 "src/lexer-keywords.txt"
@@ -539,26 +569,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"i64.trunc_f32_u", TokenType::Convert, Opcode::I64TruncF32U},
#line 263 "src/lexer-keywords.txt"
{"i32.trunc_f32_u", TokenType::Convert, Opcode::I32TruncF32U},
-#line 367 "src/lexer-keywords.txt"
- {"i64.load32_s", TokenType::Load, Opcode::I64Load32S},
- {""}, {""},
-#line 504 "src/lexer-keywords.txt"
- {"v128.or", TokenType::Binary, Opcode::V128Or},
-#line 368 "src/lexer-keywords.txt"
- {"i64.load32_u", TokenType::Load, Opcode::I64Load32U},
-#line 313 "src/lexer-keywords.txt"
- {"i64.atomic.load", TokenType::AtomicLoad, Opcode::I64AtomicLoad},
-#line 198 "src/lexer-keywords.txt"
- {"i32.atomic.load", TokenType::AtomicLoad, Opcode::I32AtomicLoad},
- {""}, {""},
-#line 101 "src/lexer-keywords.txt"
- {"f64.convert_i32_s", TokenType::Convert, Opcode::F64ConvertI32S},
-#line 50 "src/lexer-keywords.txt"
- {"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S},
-#line 480 "src/lexer-keywords.txt"
- {"return_call", TokenType::ReturnCall, Opcode::ReturnCall},
-#line 129 "src/lexer-keywords.txt"
- {"f64x2.div", TokenType::Binary, Opcode::F64X2Div},
+ {""}, {""}, {""}, {""}, {""}, {""},
#line 393 "src/lexer-keywords.txt"
{"i64.trunc_f64_s", TokenType::Convert, Opcode::I64TruncF64S},
#line 264 "src/lexer-keywords.txt"
@@ -567,277 +578,349 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"i64.trunc_f64_u", TokenType::Convert, Opcode::I64TruncF64U},
#line 265 "src/lexer-keywords.txt"
{"i32.trunc_f64_u", TokenType::Convert, Opcode::I32TruncF64U},
-#line 502 "src/lexer-keywords.txt"
- {"v128.load", TokenType::Load, Opcode::V128Load},
-#line 543 "src/lexer-keywords.txt"
- {"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S},
-#line 531 "src/lexer-keywords.txt"
- {"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S},
-#line 547 "src/lexer-keywords.txt"
- {"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U},
-#line 535 "src/lexer-keywords.txt"
- {"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U},
- {""}, {""},
-#line 323 "src/lexer-keywords.txt"
- {"i64.atomic.rmw32.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw32CmpxchgU},
-#line 338 "src/lexer-keywords.txt"
- {"i64.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I64AtomicRmwOr},
-#line 216 "src/lexer-keywords.txt"
- {"i32.atomic.rmw.or", TokenType::AtomicRmw, Opcode::I32AtomicRmwOr},
-#line 103 "src/lexer-keywords.txt"
- {"f64.convert_i64_s", TokenType::Convert, Opcode::F64ConvertI64S},
-#line 52 "src/lexer-keywords.txt"
- {"f32.convert_i64_s", TokenType::Convert, Opcode::F32ConvertI64S},
+ {""}, {""}, {""}, {""},
+#line 505 "src/lexer-keywords.txt"
+ {"v128.or", TokenType::Binary, Opcode::V128Or},
{""}, {""},
-#line 39 "src/lexer-keywords.txt"
- {"drop", TokenType::Drop, Opcode::Drop},
- {""}, {""}, {""},
-#line 544 "src/lexer-keywords.txt"
- {"i64.trunc_s/f64", TokenType::Convert, Opcode::I64TruncF64S},
-#line 532 "src/lexer-keywords.txt"
- {"i32.trunc_s/f64", TokenType::Convert, Opcode::I32TruncF64S},
-#line 548 "src/lexer-keywords.txt"
- {"i64.trunc_u/f64", TokenType::Convert, Opcode::I64TruncF64U},
-#line 536 "src/lexer-keywords.txt"
- {"i32.trunc_u/f64", TokenType::Convert, Opcode::I32TruncF64U},
-#line 456 "src/lexer-keywords.txt"
- {"loop", TokenType::Loop, Opcode::Loop},
-#line 365 "src/lexer-keywords.txt"
- {"i64.load16_s", TokenType::Load, Opcode::I64Load16S},
-#line 239 "src/lexer-keywords.txt"
- {"i32.load16_s", TokenType::Load, Opcode::I32Load16S},
+#line 521 "src/lexer-keywords.txt"
+ {"f32.demote/f64", TokenType::Convert, Opcode::F32DemoteF64},
{""}, {""},
-#line 366 "src/lexer-keywords.txt"
- {"i64.load16_u", TokenType::Load, Opcode::I64Load16U},
-#line 240 "src/lexer-keywords.txt"
- {"i32.load16_u", TokenType::Load, Opcode::I32Load16U},
-#line 335 "src/lexer-keywords.txt"
- {"i64.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I64AtomicRmwAdd},
-#line 213 "src/lexer-keywords.txt"
- {"i32.atomic.rmw.add", TokenType::AtomicRmw, Opcode::I32AtomicRmwAdd},
+#line 336 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I64AtomicRmwAnd},
+#line 214 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I32AtomicRmwAnd},
#line 322 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AndU},
- {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 312 "src/lexer-keywords.txt"
+ {"i64.atomic.load8_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad8U},
+#line 197 "src/lexer-keywords.txt"
+ {"i32.atomic.load8_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad8U},
+ {""}, {""}, {""}, {""},
+#line 466 "src/lexer-keywords.txt"
+ {"nan:canonical", TokenType::NanCanonical},
#line 321 "src/lexer-keywords.txt"
{"i64.atomic.rmw32.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32AddU},
{""}, {""},
-#line 148 "src/lexer-keywords.txt"
- {"get", TokenType::Get},
-#line 324 "src/lexer-keywords.txt"
- {"i64.atomic.rmw32.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32OrU},
- {""},
-#line 470 "src/lexer-keywords.txt"
- {"param", TokenType::Param},
- {""},
+#line 122 "src/lexer-keywords.txt"
+ {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt},
+#line 71 "src/lexer-keywords.txt"
+ {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt},
#line 339 "src/lexer-keywords.txt"
{"i64.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I64AtomicRmwSub},
#line 217 "src/lexer-keywords.txt"
{"i32.atomic.rmw.sub", TokenType::AtomicRmw, Opcode::I32AtomicRmwSub},
- {""}, {""}, {""}, {""},
-#line 349 "src/lexer-keywords.txt"
- {"i64.ctz", TokenType::Unary, Opcode::I64Ctz},
-#line 226 "src/lexer-keywords.txt"
- {"i32.ctz", TokenType::Unary, Opcode::I32Ctz},
-#line 312 "src/lexer-keywords.txt"
- {"i64.atomic.load8_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad8U},
-#line 197 "src/lexer-keywords.txt"
- {"i32.atomic.load8_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad8U},
- {""}, {""},
-#line 318 "src/lexer-keywords.txt"
- {"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU},
-#line 203 "src/lexer-keywords.txt"
- {"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU},
{""}, {""},
-#line 21 "src/lexer-keywords.txt"
- {"assert_malformed", TokenType::AssertMalformed},
- {""}, {""},
-#line 336 "src/lexer-keywords.txt"
- {"i64.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I64AtomicRmwAnd},
-#line 214 "src/lexer-keywords.txt"
- {"i32.atomic.rmw.and", TokenType::AtomicRmw, Opcode::I32AtomicRmwAnd},
+#line 503 "src/lexer-keywords.txt"
+ {"v128.load", TokenType::Load, Opcode::V128Load},
{""}, {""}, {""}, {""}, {""}, {""},
-#line 102 "src/lexer-keywords.txt"
- {"f64.convert_i32_u", TokenType::Convert, Opcode::F64ConvertI32U},
-#line 51 "src/lexer-keywords.txt"
- {"f32.convert_i32_u", TokenType::Convert, Opcode::F32ConvertI32U},
-#line 471 "src/lexer-keywords.txt"
- {"quote", TokenType::Quote},
- {""},
-#line 347 "src/lexer-keywords.txt"
- {"i64.clz", TokenType::Unary, Opcode::I64Clz},
-#line 224 "src/lexer-keywords.txt"
- {"i32.clz", TokenType::Unary, Opcode::I32Clz},
+#line 101 "src/lexer-keywords.txt"
+ {"f64.convert_i32_s", TokenType::Convert, Opcode::F64ConvertI32S},
+#line 50 "src/lexer-keywords.txt"
+ {"f32.convert_i32_s", TokenType::Convert, Opcode::F32ConvertI32S},
{""},
#line 479 "src/lexer-keywords.txt"
{"return_call_indirect", TokenType::ReturnCallIndirect, Opcode::ReturnCallIndirect},
+#line 501 "src/lexer-keywords.txt"
+ {"v128.bitselect", TokenType::Ternary, Opcode::V128BitSelect},
{""},
-#line 28 "src/lexer-keywords.txt"
- {"br_if", TokenType::BrIf, Opcode::BrIf},
+#line 502 "src/lexer-keywords.txt"
+ {"v128.const", TokenType::Const, Opcode::V128Const},
{""},
-#line 386 "src/lexer-keywords.txt"
- {"i64.store16", TokenType::Store, Opcode::I64Store16},
-#line 258 "src/lexer-keywords.txt"
- {"i32.store16", TokenType::Store, Opcode::I32Store16},
- {""}, {""}, {""}, {""}, {""},
-#line 104 "src/lexer-keywords.txt"
- {"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U},
-#line 53 "src/lexer-keywords.txt"
- {"f32.convert_i64_u", TokenType::Convert, Opcode::F32ConvertI64U},
- {""}, {""}, {""}, {""}, {""},
-#line 487 "src/lexer-keywords.txt"
- {"table.get", TokenType::TableGet, Opcode::TableGet},
+#line 148 "src/lexer-keywords.txt"
+ {"get", TokenType::Get},
{""}, {""},
-#line 122 "src/lexer-keywords.txt"
- {"f64.sqrt", TokenType::Unary, Opcode::F64Sqrt},
-#line 71 "src/lexer-keywords.txt"
- {"f32.sqrt", TokenType::Unary, Opcode::F32Sqrt},
-#line 376 "src/lexer-keywords.txt"
- {"i64.or", TokenType::Binary, Opcode::I64Or},
-#line 248 "src/lexer-keywords.txt"
- {"i32.or", TokenType::Binary, Opcode::I32Or},
-#line 142 "src/lexer-keywords.txt"
- {"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat},
-#line 466 "src/lexer-keywords.txt"
- {"nan:canonical", TokenType::NanCanonical},
+#line 103 "src/lexer-keywords.txt"
+ {"f64.convert_i64_s", TokenType::Convert, Opcode::F64ConvertI64S},
+#line 52 "src/lexer-keywords.txt"
+ {"f32.convert_i64_s", TokenType::Convert, Opcode::F32ConvertI64S},
+ {""},
+#line 129 "src/lexer-keywords.txt"
+ {"f64x2.div", TokenType::Binary, Opcode::F64X2Div},
+ {""}, {""},
+#line 471 "src/lexer-keywords.txt"
+ {"quote", TokenType::Quote},
+ {""}, {""}, {""},
#line 96 "src/lexer-keywords.txt"
{"f32x4", TokenType::F32X4},
{""}, {""},
-#line 410 "src/lexer-keywords.txt"
- {"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat},
+#line 324 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw32.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32OrU},
{""},
#line 300 "src/lexer-keywords.txt"
{"i32x4", TokenType::I32X4},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 522 "src/lexer-keywords.txt"
- {"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S},
-#line 516 "src/lexer-keywords.txt"
- {"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S},
-#line 524 "src/lexer-keywords.txt"
- {"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U},
-#line 518 "src/lexer-keywords.txt"
- {"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U},
-#line 342 "src/lexer-keywords.txt"
- {"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16},
-#line 220 "src/lexer-keywords.txt"
- {"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 316 "src/lexer-keywords.txt"
- {"i64.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw16CmpxchgU},
-#line 201 "src/lexer-keywords.txt"
- {"i32.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw16CmpxchgU},
+ {""},
+#line 544 "src/lexer-keywords.txt"
+ {"i64.trunc_s/f32", TokenType::Convert, Opcode::I64TruncF32S},
+#line 532 "src/lexer-keywords.txt"
+ {"i32.trunc_s/f32", TokenType::Convert, Opcode::I32TruncF32S},
+#line 548 "src/lexer-keywords.txt"
+ {"i64.trunc_u/f32", TokenType::Convert, Opcode::I64TruncF32U},
+#line 536 "src/lexer-keywords.txt"
+ {"i32.trunc_u/f32", TokenType::Convert, Opcode::I32TruncF32U},
+ {""}, {""}, {""}, {""},
+#line 323 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw32.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw32CmpxchgU},
+ {""},
+#line 545 "src/lexer-keywords.txt"
+ {"i64.trunc_s/f64", TokenType::Convert, Opcode::I64TruncF64S},
+#line 533 "src/lexer-keywords.txt"
+ {"i32.trunc_s/f64", TokenType::Convert, Opcode::I32TruncF64S},
+#line 549 "src/lexer-keywords.txt"
+ {"i64.trunc_u/f64", TokenType::Convert, Opcode::I64TruncF64U},
+#line 537 "src/lexer-keywords.txt"
+ {"i32.trunc_u/f64", TokenType::Convert, Opcode::I32TruncF64U},
+ {""}, {""},
+#line 28 "src/lexer-keywords.txt"
+ {"br_if", TokenType::BrIf, Opcode::BrIf},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 386 "src/lexer-keywords.txt"
+ {"i64.store16", TokenType::Store, Opcode::I64Store16},
+#line 258 "src/lexer-keywords.txt"
+ {"i32.store16", TokenType::Store, Opcode::I32Store16},
{""}, {""}, {""}, {""}, {""}, {""},
#line 91 "src/lexer-keywords.txt"
{"f32x4.ne", TokenType::Compare, Opcode::F32X4Ne},
+ {""}, {""},
#line 86 "src/lexer-keywords.txt"
{"f32x4.lt", TokenType::Compare, Opcode::F32X4Lt},
- {""}, {""}, {""},
+#line 88 "src/lexer-keywords.txt"
+ {"f32x4.min", TokenType::Binary, Opcode::F32X4Min},
#line 293 "src/lexer-keywords.txt"
{"i32x4.ne", TokenType::Compare, Opcode::I32X4Ne},
- {""}, {""}, {""},
+ {""},
#line 289 "src/lexer-keywords.txt"
{"i32x4.min_s", TokenType::Binary, Opcode::I32X4MinS},
- {""},
-#line 88 "src/lexer-keywords.txt"
- {"f32x4.min", TokenType::Binary, Opcode::F32X4Min},
-#line 285 "src/lexer-keywords.txt"
- {"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS},
+#line 488 "src/lexer-keywords.txt"
+ {"table.get", TokenType::TableGet, Opcode::TableGet},
+ {""}, {""},
#line 290 "src/lexer-keywords.txt"
{"i32x4.min_u", TokenType::Binary, Opcode::I32X4MinU},
-#line 286 "src/lexer-keywords.txt"
- {"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU},
+ {""},
+#line 318 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16SubU},
+#line 203 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw16.sub_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16SubU},
#line 85 "src/lexer-keywords.txt"
{"f32x4.le", TokenType::Compare, Opcode::F32X4Le},
-#line 315 "src/lexer-keywords.txt"
- {"i64.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AndU},
-#line 200 "src/lexer-keywords.txt"
- {"i32.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AndU},
+#line 285 "src/lexer-keywords.txt"
+ {"i32x4.lt_s", TokenType::Compare, Opcode::I32X4LtS},
{""},
+#line 286 "src/lexer-keywords.txt"
+ {"i32x4.lt_u", TokenType::Compare, Opcode::I32X4LtU},
+ {""}, {""}, {""},
#line 281 "src/lexer-keywords.txt"
{"i32x4.le_s", TokenType::Compare, Opcode::I32X4LeS},
-#line 452 "src/lexer-keywords.txt"
- {"local.get", TokenType::LocalGet, Opcode::LocalGet},
+ {""},
#line 282 "src/lexer-keywords.txt"
{"i32x4.le_u", TokenType::Compare, Opcode::I32X4LeU},
-#line 133 "src/lexer-keywords.txt"
- {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt},
-#line 314 "src/lexer-keywords.txt"
- {"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU},
-#line 199 "src/lexer-keywords.txt"
- {"i32.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AddU},
+#line 497 "src/lexer-keywords.txt"
+ {"type", TokenType::Type},
{""},
-#line 150 "src/lexer-keywords.txt"
- {"global.set", TokenType::GlobalSet, Opcode::GlobalSet},
-#line 317 "src/lexer-keywords.txt"
- {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU},
-#line 202 "src/lexer-keywords.txt"
- {"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU},
- {""}, {""}, {""}, {""},
-#line 151 "src/lexer-keywords.txt"
- {"global", TokenType::Global},
- {""}, {""},
-#line 132 "src/lexer-keywords.txt"
- {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge},
+#line 449 "src/lexer-keywords.txt"
+ {"import", TokenType::Import},
{""},
+#line 45 "src/lexer-keywords.txt"
+ {"export", TokenType::Export},
+ {""}, {""},
#line 89 "src/lexer-keywords.txt"
{"f32x4.mul", TokenType::Binary, Opcode::F32X4Mul},
{""}, {""}, {""}, {""},
#line 291 "src/lexer-keywords.txt"
{"i32x4.mul", TokenType::Binary, Opcode::I32X4Mul},
+ {""}, {""},
+#line 102 "src/lexer-keywords.txt"
+ {"f64.convert_i32_u", TokenType::Convert, Opcode::F64ConvertI32U},
+#line 51 "src/lexer-keywords.txt"
+ {"f32.convert_i32_u", TokenType::Convert, Opcode::F32ConvertI32U},
+ {""}, {""}, {""},
+#line 95 "src/lexer-keywords.txt"
+ {"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub},
{""}, {""}, {""}, {""},
+#line 299 "src/lexer-keywords.txt"
+ {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub},
+#line 104 "src/lexer-keywords.txt"
+ {"f64.convert_i64_u", TokenType::Convert, Opcode::F64ConvertI64U},
+#line 53 "src/lexer-keywords.txt"
+ {"f32.convert_i64_u", TokenType::Convert, Opcode::F32ConvertI64U},
+ {""}, {""}, {""},
+#line 76 "src/lexer-keywords.txt"
+ {"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs},
+ {""},
+#line 315 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AndU},
+#line 200 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw16.and_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AndU},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 470 "src/lexer-keywords.txt"
+ {"param", TokenType::Param},
+ {""},
+#line 476 "src/lexer-keywords.txt"
+ {"register", TokenType::Register},
+#line 314 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16AddU},
+#line 199 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw16.add_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16AddU},
+ {""}, {""}, {""}, {""},
+#line 77 "src/lexer-keywords.txt"
+ {"f32x4.add", TokenType::Binary, Opcode::F32X4Add},
+ {""},
#line 395 "src/lexer-keywords.txt"
{"i64.trunc_sat_f32_s", TokenType::Convert, Opcode::I64TruncSatF32S},
#line 266 "src/lexer-keywords.txt"
{"i32.trunc_sat_f32_s", TokenType::Convert, Opcode::I32TruncSatF32S},
-#line 95 "src/lexer-keywords.txt"
- {"f32x4.sub", TokenType::Binary, Opcode::F32X4Sub},
- {""},
+#line 143 "src/lexer-keywords.txt"
+ {"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt},
+#line 272 "src/lexer-keywords.txt"
+ {"i32x4.add", TokenType::Binary, Opcode::I32X4Add},
#line 396 "src/lexer-keywords.txt"
{"i64.trunc_sat_f32_u", TokenType::Convert, Opcode::I64TruncSatF32U},
#line 267 "src/lexer-keywords.txt"
{"i32.trunc_sat_f32_u", TokenType::Convert, Opcode::I32TruncSatF32U},
+ {""}, {""}, {""},
+#line 151 "src/lexer-keywords.txt"
+ {"global", TokenType::Global},
+#line 342 "src/lexer-keywords.txt"
+ {"i64.atomic.store16", TokenType::AtomicStore, Opcode::I64AtomicStore16},
+#line 220 "src/lexer-keywords.txt"
+ {"i32.atomic.store16", TokenType::AtomicStore, Opcode::I32AtomicStore16},
+ {""}, {""}, {""},
+#line 310 "src/lexer-keywords.txt"
+ {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U},
+#line 196 "src/lexer-keywords.txt"
+ {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U},
+#line 150 "src/lexer-keywords.txt"
+ {"global.set", TokenType::GlobalSet, Opcode::GlobalSet},
{""},
-#line 299 "src/lexer-keywords.txt"
- {"i32x4.sub", TokenType::Binary, Opcode::I32X4Sub},
+#line 376 "src/lexer-keywords.txt"
+ {"i64.or", TokenType::Binary, Opcode::I64Or},
+#line 248 "src/lexer-keywords.txt"
+ {"i32.or", TokenType::Binary, Opcode::I32Or},
{""},
-#line 330 "src/lexer-keywords.txt"
- {"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU},
-#line 208 "src/lexer-keywords.txt"
- {"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU},
+#line 39 "src/lexer-keywords.txt"
+ {"drop", TokenType::Drop, Opcode::Drop},
+ {""}, {""}, {""},
+#line 456 "src/lexer-keywords.txt"
+ {"loop", TokenType::Loop, Opcode::Loop},
+#line 133 "src/lexer-keywords.txt"
+ {"f64x2.gt", TokenType::Compare, Opcode::F64X2Gt},
+ {""},
+#line 452 "src/lexer-keywords.txt"
+ {"local.get", TokenType::LocalGet, Opcode::LocalGet},
+#line 18 "src/lexer-keywords.txt"
+ {"anyref", Type::Anyref},
+#line 489 "src/lexer-keywords.txt"
+ {"table.grow", TokenType::TableGrow, Opcode::TableGrow},
+#line 317 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16OrU},
+#line 202 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw16.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16OrU},
+#line 460 "src/lexer-keywords.txt"
+ {"memory.init", TokenType::MemoryInit, Opcode::MemoryInit},
{""}, {""}, {""}, {""},
+#line 132 "src/lexer-keywords.txt"
+ {"f64x2.ge", TokenType::Compare, Opcode::F64X2Ge},
+ {""},
+#line 461 "src/lexer-keywords.txt"
+ {"memory.size", TokenType::MemorySize, Opcode::MemorySize},
+ {""}, {""},
+#line 316 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw16CmpxchgU},
+#line 201 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw16.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw16CmpxchgU},
+ {""}, {""}, {""},
+#line 353 "src/lexer-keywords.txt"
+ {"i64.eqz", TokenType::Convert, Opcode::I64Eqz},
+#line 230 "src/lexer-keywords.txt"
+ {"i32.eqz", TokenType::Convert, Opcode::I32Eqz},
+ {""}, {""},
+#line 273 "src/lexer-keywords.txt"
+ {"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue},
+#line 495 "src/lexer-keywords.txt"
+ {"throw", TokenType::Throw, Opcode::Throw},
#line 311 "src/lexer-keywords.txt"
{"i64.atomic.load32_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad32U},
-#line 494 "src/lexer-keywords.txt"
- {"throw", TokenType::Throw, Opcode::Throw},
-#line 488 "src/lexer-keywords.txt"
- {"table.grow", TokenType::TableGrow, Opcode::TableGrow},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 458 "src/lexer-keywords.txt"
+ {"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill},
+ {""}, {""}, {""}, {""}, {""},
+#line 523 "src/lexer-keywords.txt"
+ {"f64.convert_s/i32", TokenType::Convert, Opcode::F64ConvertI32S},
+#line 517 "src/lexer-keywords.txt"
+ {"f32.convert_s/i32", TokenType::Convert, Opcode::F32ConvertI32S},
+#line 525 "src/lexer-keywords.txt"
+ {"f64.convert_u/i32", TokenType::Convert, Opcode::F64ConvertI32U},
+#line 519 "src/lexer-keywords.txt"
+ {"f32.convert_u/i32", TokenType::Convert, Opcode::F32ConvertI32U},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 108 "src/lexer-keywords.txt"
+ {"f64.floor", TokenType::Unary, Opcode::F64Floor},
+#line 58 "src/lexer-keywords.txt"
+ {"f32.floor", TokenType::Unary, Opcode::F32Floor},
+ {""}, {""}, {""}, {""},
+#line 356 "src/lexer-keywords.txt"
+ {"i64.extend8_s", TokenType::Unary, Opcode::I64Extend8S},
+#line 232 "src/lexer-keywords.txt"
+ {"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 107 "src/lexer-keywords.txt"
+ {"f64.eq", TokenType::Compare, Opcode::F64Eq},
+#line 57 "src/lexer-keywords.txt"
+ {"f32.eq", TokenType::Compare, Opcode::F32Eq},
+ {""}, {""}, {""},
+#line 352 "src/lexer-keywords.txt"
+ {"i64.eq", TokenType::Compare, Opcode::I64Eq},
+#line 229 "src/lexer-keywords.txt"
+ {"i32.eq", TokenType::Compare, Opcode::I32Eq},
+#line 142 "src/lexer-keywords.txt"
+ {"f64x2.splat", TokenType::Unary, Opcode::F64X2Splat},
+#line 472 "src/lexer-keywords.txt"
+ {"ref.func", TokenType::RefFunc, Opcode::RefFunc},
+#line 80 "src/lexer-keywords.txt"
+ {"f32x4.div", TokenType::Binary, Opcode::F32X4Div},
+ {""}, {""},
+#line 410 "src/lexer-keywords.txt"
+ {"i64x2.splat", TokenType::Unary, Opcode::I64X2Splat},
+ {""}, {""},
+#line 413 "src/lexer-keywords.txt"
+ {"i64.xor", TokenType::Binary, Opcode::I64Xor},
+#line 307 "src/lexer-keywords.txt"
+ {"i32.xor", TokenType::Binary, Opcode::I32Xor},
+ {""}, {""},
+#line 530 "src/lexer-keywords.txt"
+ {"get_local", TokenType::LocalGet, Opcode::LocalGet},
+ {""},
#line 110 "src/lexer-keywords.txt"
{"f64.gt", TokenType::Compare, Opcode::F64Gt},
#line 60 "src/lexer-keywords.txt"
{"f32.gt", TokenType::Compare, Opcode::F32Gt},
- {""}, {""},
-#line 540 "src/lexer-keywords.txt"
- {"i64.extend_s/i32", TokenType::Convert, Opcode::I64ExtendI32S},
{""},
+#line 120 "src/lexer-keywords.txt"
+ {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32},
+#line 29 "src/lexer-keywords.txt"
+ {"br_on_exn", TokenType::BrOnExn, Opcode::BrOnExn},
#line 541 "src/lexer-keywords.txt"
- {"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U},
- {""}, {""}, {""},
-#line 143 "src/lexer-keywords.txt"
- {"f64x2.sqrt", TokenType::Unary, Opcode::F64X2Sqrt},
+ {"i64.extend_s/i32", TokenType::Convert, Opcode::I64ExtendI32S},
{""},
-#line 361 "src/lexer-keywords.txt"
- {"i64.gt_s", TokenType::Compare, Opcode::I64GtS},
-#line 235 "src/lexer-keywords.txt"
- {"i32.gt_s", TokenType::Compare, Opcode::I32GtS},
+#line 542 "src/lexer-keywords.txt"
+ {"i64.extend_u/i32", TokenType::Convert, Opcode::I64ExtendI32U},
+ {""}, {""}, {""}, {""},
#line 109 "src/lexer-keywords.txt"
{"f64.ge", TokenType::Compare, Opcode::F64Ge},
#line 59 "src/lexer-keywords.txt"
{"f32.ge", TokenType::Compare, Opcode::F32Ge},
+#line 361 "src/lexer-keywords.txt"
+ {"i64.gt_s", TokenType::Compare, Opcode::I64GtS},
+#line 235 "src/lexer-keywords.txt"
+ {"i32.gt_s", TokenType::Compare, Opcode::I32GtS},
+ {""}, {""},
#line 362 "src/lexer-keywords.txt"
{"i64.gt_u", TokenType::Compare, Opcode::I64GtU},
#line 236 "src/lexer-keywords.txt"
{"i32.gt_u", TokenType::Compare, Opcode::I32GtU},
-#line 467 "src/lexer-keywords.txt"
- {"nop", TokenType::Nop, Opcode::Nop},
#line 359 "src/lexer-keywords.txt"
{"i64.ge_s", TokenType::Compare, Opcode::I64GeS},
#line 233 "src/lexer-keywords.txt"
@@ -848,667 +931,590 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
#line 234 "src/lexer-keywords.txt"
{"i32.ge_u", TokenType::Compare, Opcode::I32GeU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 331 "src/lexer-keywords.txt"
- {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU},
-#line 209 "src/lexer-keywords.txt"
- {"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU},
- {""}, {""},
-#line 76 "src/lexer-keywords.txt"
- {"f32x4.abs", TokenType::Unary, Opcode::F32X4Abs},
- {""},
-#line 356 "src/lexer-keywords.txt"
- {"i64.extend8_s", TokenType::Unary, Opcode::I64Extend8S},
-#line 232 "src/lexer-keywords.txt"
- {"i32.extend8_s", TokenType::Unary, Opcode::I32Extend8S},
- {""}, {""}, {""}, {""},
-#line 29 "src/lexer-keywords.txt"
- {"br_on_exn", TokenType::BrOnExn, Opcode::BrOnExn},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 77 "src/lexer-keywords.txt"
- {"f32x4.add", TokenType::Binary, Opcode::F32X4Add},
-#line 472 "src/lexer-keywords.txt"
- {"ref.func", TokenType::RefFunc, Opcode::RefFunc},
- {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 330 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmw8CmpxchgU},
+#line 208 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw8.cmpxchg_u", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmw8CmpxchgU},
+#line 355 "src/lexer-keywords.txt"
+ {"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S},
#line 383 "src/lexer-keywords.txt"
{"i64.shl", TokenType::Binary, Opcode::I64Shl},
#line 255 "src/lexer-keywords.txt"
{"i32.shl", TokenType::Binary, Opcode::I32Shl},
-#line 272 "src/lexer-keywords.txt"
- {"i32x4.add", TokenType::Binary, Opcode::I32X4Add},
-#line 476 "src/lexer-keywords.txt"
- {"register", TokenType::Register},
-#line 310 "src/lexer-keywords.txt"
- {"i64.atomic.load16_u", TokenType::AtomicLoad, Opcode::I64AtomicLoad16U},
-#line 196 "src/lexer-keywords.txt"
- {"i32.atomic.load16_u", TokenType::AtomicLoad, Opcode::I32AtomicLoad16U},
- {""}, {""}, {""}, {""}, {""},
-#line 34 "src/lexer-keywords.txt"
- {"catch", TokenType::Catch, Opcode::Catch},
-#line 460 "src/lexer-keywords.txt"
- {"memory.init", TokenType::MemoryInit, Opcode::MemoryInit},
- {""}, {""}, {""},
-#line 461 "src/lexer-keywords.txt"
- {"memory.size", TokenType::MemorySize, Opcode::MemorySize},
- {""}, {""}, {""}, {""}, {""},
-#line 355 "src/lexer-keywords.txt"
- {"i64.extend32_s", TokenType::Unary, Opcode::I64Extend32S},
- {""}, {""}, {""}, {""},
+ {""}, {""},
#line 384 "src/lexer-keywords.txt"
{"i64.shr_s", TokenType::Binary, Opcode::I64ShrS},
#line 256 "src/lexer-keywords.txt"
{"i32.shr_s", TokenType::Binary, Opcode::I32ShrS},
- {""},
#line 357 "src/lexer-keywords.txt"
{"i64.extend_i32_s", TokenType::Convert, Opcode::I64ExtendI32S},
+ {""},
#line 385 "src/lexer-keywords.txt"
{"i64.shr_u", TokenType::Binary, Opcode::I64ShrU},
#line 257 "src/lexer-keywords.txt"
{"i32.shr_u", TokenType::Binary, Opcode::I32ShrU},
- {""},
#line 358 "src/lexer-keywords.txt"
{"i64.extend_i32_u", TokenType::Convert, Opcode::I64ExtendI32U},
-#line 80 "src/lexer-keywords.txt"
- {"f32x4.div", TokenType::Binary, Opcode::F32X4Div},
- {""}, {""}, {""},
-#line 108 "src/lexer-keywords.txt"
- {"f64.floor", TokenType::Unary, Opcode::F64Floor},
-#line 58 "src/lexer-keywords.txt"
- {"f32.floor", TokenType::Unary, Opcode::F32Floor},
- {""},
-#line 438 "src/lexer-keywords.txt"
- {"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne},
- {""}, {""},
-#line 529 "src/lexer-keywords.txt"
- {"get_local", TokenType::LocalGet, Opcode::LocalGet},
-#line 433 "src/lexer-keywords.txt"
- {"i8x16.min_s", TokenType::Binary, Opcode::I8X16MinS},
- {""}, {""},
-#line 429 "src/lexer-keywords.txt"
- {"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS},
-#line 434 "src/lexer-keywords.txt"
- {"i8x16.min_u", TokenType::Binary, Opcode::I8X16MinU},
-#line 430 "src/lexer-keywords.txt"
- {"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU},
-#line 458 "src/lexer-keywords.txt"
- {"memory.fill", TokenType::MemoryFill, Opcode::MemoryFill},
+#line 331 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8OrU},
+#line 209 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw8.or_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8OrU},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 354 "src/lexer-keywords.txt"
+ {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S},
+#line 231 "src/lexer-keywords.txt"
+ {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S},
+ {""}, {""}, {""}, {""}, {""}, {""},
#line 70 "src/lexer-keywords.txt"
{"f32.reinterpret_i32", TokenType::Convert, Opcode::F32ReinterpretI32},
- {""}, {""},
-#line 427 "src/lexer-keywords.txt"
- {"i8x16.le_s", TokenType::Compare, Opcode::I8X16LeS},
- {""},
-#line 428 "src/lexer-keywords.txt"
- {"i8x16.le_u", TokenType::Compare, Opcode::I8X16LeU},
-#line 18 "src/lexer-keywords.txt"
- {"anyref", Type::Anyref},
- {""}, {""}, {""},
-#line 120 "src/lexer-keywords.txt"
- {"f64.promote_f32", TokenType::Convert, Opcode::F64PromoteF32},
- {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 527 "src/lexer-keywords.txt"
+ {"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32},
#line 121 "src/lexer-keywords.txt"
{"f64.reinterpret_i64", TokenType::Convert, Opcode::F64ReinterpretI64},
- {""}, {""}, {""}, {""},
+ {""},
#line 180 "src/lexer-keywords.txt"
{"i16x8.ne", TokenType::Compare, Opcode::I16X8Ne},
{""},
-#line 521 "src/lexer-keywords.txt"
- {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32},
- {""},
#line 174 "src/lexer-keywords.txt"
{"i16x8.min_s", TokenType::Binary, Opcode::I16X8MinS},
- {""}, {""},
-#line 170 "src/lexer-keywords.txt"
- {"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS},
+ {""}, {""}, {""},
#line 175 "src/lexer-keywords.txt"
{"i16x8.min_u", TokenType::Binary, Opcode::I16X8MinU},
+ {""},
+#line 305 "src/lexer-keywords.txt"
+ {"i32x4.widen_low_i16x8_s", TokenType::Unary, Opcode::I32X4WidenLowI16X8S},
+ {""},
+#line 306 "src/lexer-keywords.txt"
+ {"i32x4.widen_low_i16x8_u", TokenType::Unary, Opcode::I32X4WidenLowI16X8U},
+#line 170 "src/lexer-keywords.txt"
+ {"i16x8.lt_s", TokenType::Compare, Opcode::I16X8LtS},
+ {""},
#line 171 "src/lexer-keywords.txt"
{"i16x8.lt_u", TokenType::Compare, Opcode::I16X8LtU},
- {""}, {""},
-#line 526 "src/lexer-keywords.txt"
- {"f64.promote/f32", TokenType::Convert, Opcode::F64PromoteF32},
- {""},
+ {""}, {""}, {""},
#line 166 "src/lexer-keywords.txt"
{"i16x8.le_s", TokenType::Compare, Opcode::I16X8LeS},
- {""},
+#line 34 "src/lexer-keywords.txt"
+ {"catch", TokenType::Catch, Opcode::Catch},
#line 167 "src/lexer-keywords.txt"
{"i16x8.le_u", TokenType::Compare, Opcode::I16X8LeU},
-#line 527 "src/lexer-keywords.txt"
- {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64},
-#line 510 "src/lexer-keywords.txt"
- {"v64x2.load_splat", TokenType::Load, Opcode::V64X2LoadSplat},
-#line 446 "src/lexer-keywords.txt"
- {"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub},
- {""},
-#line 107 "src/lexer-keywords.txt"
- {"f64.eq", TokenType::Compare, Opcode::F64Eq},
-#line 57 "src/lexer-keywords.txt"
- {"f32.eq", TokenType::Compare, Opcode::F32Eq},
-#line 273 "src/lexer-keywords.txt"
- {"i32x4.all_true", TokenType::Unary, Opcode::I32X4AllTrue},
- {""}, {""},
-#line 352 "src/lexer-keywords.txt"
- {"i64.eq", TokenType::Compare, Opcode::I64Eq},
-#line 229 "src/lexer-keywords.txt"
- {"i32.eq", TokenType::Compare, Opcode::I32Eq},
- {""},
-#line 353 "src/lexer-keywords.txt"
- {"i64.eqz", TokenType::Convert, Opcode::I64Eqz},
-#line 230 "src/lexer-keywords.txt"
- {"i32.eqz", TokenType::Convert, Opcode::I32Eqz},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 176 "src/lexer-keywords.txt"
- {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul},
#line 189 "src/lexer-keywords.txt"
{"i16x8", TokenType::I16X8},
- {""}, {""}, {""}, {""},
-#line 407 "src/lexer-keywords.txt"
- {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl},
{""}, {""}, {""}, {""}, {""},
-#line 188 "src/lexer-keywords.txt"
- {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub},
+#line 94 "src/lexer-keywords.txt"
+ {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt},
{""}, {""}, {""}, {""}, {""},
-#line 23 "src/lexer-keywords.txt"
- {"assert_trap", TokenType::AssertTrap},
+#line 176 "src/lexer-keywords.txt"
+ {"i16x8.mul", TokenType::Binary, Opcode::I16X8Mul},
{""},
-#line 40 "src/lexer-keywords.txt"
- {"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop},
+#line 397 "src/lexer-keywords.txt"
+ {"i64.trunc_sat_f64_s", TokenType::Convert, Opcode::I64TruncSatF64S},
+#line 268 "src/lexer-keywords.txt"
+ {"i32.trunc_sat_f64_s", TokenType::Convert, Opcode::I32TruncSatF64S},
{""}, {""},
-#line 36 "src/lexer-keywords.txt"
- {"data.drop", TokenType::DataDrop, Opcode::DataDrop},
-#line 447 "src/lexer-keywords.txt"
- {"i8x16", TokenType::I8X16},
- {""}, {""}, {""}, {""},
-#line 408 "src/lexer-keywords.txt"
- {"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS},
- {""}, {""}, {""},
-#line 409 "src/lexer-keywords.txt"
- {"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU},
-#line 93 "src/lexer-keywords.txt"
- {"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat},
- {""}, {""}, {""},
-#line 327 "src/lexer-keywords.txt"
- {"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU},
-#line 298 "src/lexer-keywords.txt"
- {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat},
+#line 398 "src/lexer-keywords.txt"
+ {"i64.trunc_sat_f64_u", TokenType::Convert, Opcode::I64TruncSatF64U},
+#line 269 "src/lexer-keywords.txt"
+ {"i32.trunc_sat_f64_u", TokenType::Convert, Opcode::I32TruncSatF64U},
+ {""}, {""},
+#line 19 "src/lexer-keywords.txt"
+ {"assert_exhaustion", TokenType::AssertExhaustion},
+ {""}, {""},
+#line 188 "src/lexer-keywords.txt"
+ {"i16x8.sub", TokenType::Binary, Opcode::I16X8Sub},
+ {""}, {""},
+#line 438 "src/lexer-keywords.txt"
+ {"i8x16.ne", TokenType::Compare, Opcode::I8X16Ne},
{""},
-#line 344 "src/lexer-keywords.txt"
- {"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8},
-#line 221 "src/lexer-keywords.txt"
- {"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8},
+#line 433 "src/lexer-keywords.txt"
+ {"i8x16.min_s", TokenType::Binary, Opcode::I8X16MinS},
+#line 84 "src/lexer-keywords.txt"
+ {"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt},
+#line 130 "src/lexer-keywords.txt"
+ {"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq},
{""},
-#line 377 "src/lexer-keywords.txt"
- {"i64.popcnt", TokenType::Unary, Opcode::I64Popcnt},
-#line 249 "src/lexer-keywords.txt"
- {"i32.popcnt", TokenType::Unary, Opcode::I32Popcnt},
+#line 434 "src/lexer-keywords.txt"
+ {"i8x16.min_u", TokenType::Binary, Opcode::I8X16MinU},
+ {""}, {""}, {""}, {""},
+#line 429 "src/lexer-keywords.txt"
+ {"i8x16.lt_s", TokenType::Compare, Opcode::I8X16LtS},
{""},
-#line 413 "src/lexer-keywords.txt"
- {"i64.xor", TokenType::Binary, Opcode::I64Xor},
-#line 307 "src/lexer-keywords.txt"
- {"i32.xor", TokenType::Binary, Opcode::I32Xor},
- {""}, {""},
-#line 416 "src/lexer-keywords.txt"
- {"i8x16.add", TokenType::Binary, Opcode::I8X16Add},
+#line 430 "src/lexer-keywords.txt"
+ {"i8x16.lt_u", TokenType::Compare, Opcode::I8X16LtU},
{""},
-#line 507 "src/lexer-keywords.txt"
- {"v128.xor", TokenType::Binary, Opcode::V128Xor},
- {""}, {""}, {""}, {""},
-#line 551 "src/lexer-keywords.txt"
- {"set_global", TokenType::GlobalSet, Opcode::GlobalSet},
+#line 83 "src/lexer-keywords.txt"
+ {"f32x4.ge", TokenType::Compare, Opcode::F32X4Ge},
+#line 279 "src/lexer-keywords.txt"
+ {"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS},
+#line 427 "src/lexer-keywords.txt"
+ {"i8x16.le_s", TokenType::Compare, Opcode::I8X16LeS},
+#line 280 "src/lexer-keywords.txt"
+ {"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU},
+#line 428 "src/lexer-keywords.txt"
+ {"i8x16.le_u", TokenType::Compare, Opcode::I8X16LeU},
{""}, {""},
-#line 326 "src/lexer-keywords.txt"
- {"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU},
+#line 277 "src/lexer-keywords.txt"
+ {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS},
+#line 522 "src/lexer-keywords.txt"
+ {"f32.reinterpret/i32", TokenType::Convert, Opcode::F32ReinterpretI32},
+#line 278 "src/lexer-keywords.txt"
+ {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU},
{""}, {""},
-#line 523 "src/lexer-keywords.txt"
- {"f64.convert_s/i64", TokenType::Convert, Opcode::F64ConvertI64S},
-#line 517 "src/lexer-keywords.txt"
- {"f32.convert_s/i64", TokenType::Convert, Opcode::F32ConvertI64S},
-#line 525 "src/lexer-keywords.txt"
- {"f64.convert_u/i64", TokenType::Convert, Opcode::F64ConvertI64U},
-#line 519 "src/lexer-keywords.txt"
- {"f32.convert_u/i64", TokenType::Convert, Opcode::F32ConvertI64U},
- {""}, {""}, {""},
-#line 19 "src/lexer-keywords.txt"
- {"assert_exhaustion", TokenType::AssertExhaustion},
+#line 155 "src/lexer-keywords.txt"
+ {"i16x8.add", TokenType::Binary, Opcode::I16X8Add},
+#line 334 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU},
+#line 212 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU},
{""},
+#line 528 "src/lexer-keywords.txt"
+ {"f64.reinterpret/i64", TokenType::Convert, Opcode::F64ReinterpretI64},
+ {""}, {""}, {""},
+#line 344 "src/lexer-keywords.txt"
+ {"i64.atomic.store8", TokenType::AtomicStore, Opcode::I64AtomicStore8},
+#line 221 "src/lexer-keywords.txt"
+ {"i32.atomic.store8", TokenType::AtomicStore, Opcode::I32AtomicStore8},
+ {""}, {""}, {""}, {""}, {""}, {""},
#line 118 "src/lexer-keywords.txt"
{"f64.neg", TokenType::Unary, Opcode::F64Neg},
#line 68 "src/lexer-keywords.txt"
{"f32.neg", TokenType::Unary, Opcode::F32Neg},
- {""}, {""},
-#line 354 "src/lexer-keywords.txt"
- {"i64.extend16_s", TokenType::Unary, Opcode::I64Extend16S},
-#line 231 "src/lexer-keywords.txt"
- {"i32.extend16_s", TokenType::Unary, Opcode::I32Extend16S},
+#line 446 "src/lexer-keywords.txt"
+ {"i8x16.sub", TokenType::Binary, Opcode::I8X16Sub},
{""}, {""}, {""},
-#line 155 "src/lexer-keywords.txt"
- {"i16x8.add", TokenType::Binary, Opcode::I16X8Add},
-#line 545 "src/lexer-keywords.txt"
+#line 552 "src/lexer-keywords.txt"
+ {"set_global", TokenType::GlobalSet, Opcode::GlobalSet},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 524 "src/lexer-keywords.txt"
+ {"f64.convert_s/i64", TokenType::Convert, Opcode::F64ConvertI64S},
+#line 518 "src/lexer-keywords.txt"
+ {"f32.convert_s/i64", TokenType::Convert, Opcode::F32ConvertI64S},
+#line 526 "src/lexer-keywords.txt"
+ {"f64.convert_u/i64", TokenType::Convert, Opcode::F64ConvertI64U},
+#line 520 "src/lexer-keywords.txt"
+ {"f32.convert_u/i64", TokenType::Convert, Opcode::F32ConvertI64U},
+#line 408 "src/lexer-keywords.txt"
+ {"i64x2.shr_s", TokenType::Binary, Opcode::I64X2ShrS},
+ {""},
+#line 407 "src/lexer-keywords.txt"
+ {"i64x2.shl", TokenType::Binary, Opcode::I64X2Shl},
+#line 508 "src/lexer-keywords.txt"
+ {"v128.xor", TokenType::Binary, Opcode::V128Xor},
+#line 409 "src/lexer-keywords.txt"
+ {"i64x2.shr_u", TokenType::Binary, Opcode::I64X2ShrU},
+ {""},
+#line 516 "src/lexer-keywords.txt"
+ {"anyfunc", Type::Funcref},
+#line 546 "src/lexer-keywords.txt"
{"i64.trunc_s:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32S},
-#line 533 "src/lexer-keywords.txt"
+#line 534 "src/lexer-keywords.txt"
{"i32.trunc_s:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32S},
-#line 549 "src/lexer-keywords.txt"
+#line 550 "src/lexer-keywords.txt"
{"i64.trunc_u:sat/f32", TokenType::Convert, Opcode::I64TruncSatF32U},
-#line 537 "src/lexer-keywords.txt"
+#line 538 "src/lexer-keywords.txt"
{"i32.trunc_u:sat/f32", TokenType::Convert, Opcode::I32TruncSatF32U},
- {""}, {""}, {""}, {""}, {""},
-#line 84 "src/lexer-keywords.txt"
- {"f32x4.gt", TokenType::Compare, Opcode::F32X4Gt},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 546 "src/lexer-keywords.txt"
+ {""},
+#line 416 "src/lexer-keywords.txt"
+ {"i8x16.add", TokenType::Binary, Opcode::I8X16Add},
+ {""},
+#line 156 "src/lexer-keywords.txt"
+ {"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue},
+ {""},
+#line 547 "src/lexer-keywords.txt"
{"i64.trunc_s:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64S},
-#line 534 "src/lexer-keywords.txt"
+#line 535 "src/lexer-keywords.txt"
{"i32.trunc_s:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64S},
-#line 550 "src/lexer-keywords.txt"
+#line 551 "src/lexer-keywords.txt"
{"i64.trunc_u:sat/f64", TokenType::Convert, Opcode::I64TruncSatF64U},
-#line 538 "src/lexer-keywords.txt"
+#line 539 "src/lexer-keywords.txt"
{"i32.trunc_u:sat/f64", TokenType::Convert, Opcode::I32TruncSatF64U},
-#line 279 "src/lexer-keywords.txt"
- {"i32x4.gt_s", TokenType::Compare, Opcode::I32X4GtS},
- {""},
-#line 280 "src/lexer-keywords.txt"
- {"i32x4.gt_u", TokenType::Compare, Opcode::I32X4GtU},
-#line 83 "src/lexer-keywords.txt"
- {"f32x4.ge", TokenType::Compare, Opcode::F32X4Ge},
-#line 130 "src/lexer-keywords.txt"
- {"f64x2.eq", TokenType::Compare, Opcode::F64X2Eq},
- {""},
-#line 141 "src/lexer-keywords.txt"
- {"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane},
-#line 277 "src/lexer-keywords.txt"
- {"i32x4.ge_s", TokenType::Compare, Opcode::I32X4GeS},
- {""},
-#line 278 "src/lexer-keywords.txt"
- {"i32x4.ge_u", TokenType::Compare, Opcode::I32X4GeU},
+ {""}, {""}, {""},
+#line 186 "src/lexer-keywords.txt"
+ {"i16x8.sub_saturate_s", TokenType::Binary, Opcode::I16X8SubSaturateS},
{""},
-#line 406 "src/lexer-keywords.txt"
- {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane},
+#line 187 "src/lexer-keywords.txt"
+ {"i16x8.sub_saturate_u", TokenType::Binary, Opcode::I16X8SubSaturateU},
+#line 327 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw32.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XorU},
+#line 511 "src/lexer-keywords.txt"
+ {"v64x2.load_splat", TokenType::Load, Opcode::V64X2LoadSplat},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 93 "src/lexer-keywords.txt"
+ {"f32x4.splat", TokenType::Unary, Opcode::F32X4Splat},
{""}, {""}, {""}, {""},
-#line 465 "src/lexer-keywords.txt"
- {"nan:arithmetic", TokenType::NanArithmetic},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 397 "src/lexer-keywords.txt"
- {"i64.trunc_sat_f64_s", TokenType::Convert, Opcode::I64TruncSatF64S},
-#line 268 "src/lexer-keywords.txt"
- {"i32.trunc_sat_f64_s", TokenType::Convert, Opcode::I32TruncSatF64S},
- {""}, {""},
-#line 398 "src/lexer-keywords.txt"
- {"i64.trunc_sat_f64_u", TokenType::Convert, Opcode::I64TruncSatF64U},
-#line 269 "src/lexer-keywords.txt"
- {"i32.trunc_sat_f64_u", TokenType::Convert, Opcode::I32TruncSatF64U},
- {""},
+#line 298 "src/lexer-keywords.txt"
+ {"i32x4.splat", TokenType::Unary, Opcode::I32X4Splat},
+ {""}, {""}, {""},
+#line 447 "src/lexer-keywords.txt"
+ {"i8x16", TokenType::I8X16},
+ {""}, {""}, {""}, {""}, {""},
+#line 467 "src/lexer-keywords.txt"
+ {"nop", TokenType::Nop, Opcode::Nop},
#line 149 "src/lexer-keywords.txt"
{"global.get", TokenType::GlobalGet, Opcode::GlobalGet},
- {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""},
#line 417 "src/lexer-keywords.txt"
{"i8x16.all_true", TokenType::Unary, Opcode::I8X16AllTrue},
-#line 94 "src/lexer-keywords.txt"
- {"f32x4.sqrt", TokenType::Unary, Opcode::F32X4Sqrt},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 497 "src/lexer-keywords.txt"
+#line 498 "src/lexer-keywords.txt"
{"unreachable", TokenType::Unreachable, Opcode::Unreachable},
- {""}, {""}, {""},
-#line 139 "src/lexer-keywords.txt"
- {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg},
- {""}, {""}, {""},
+#line 326 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw32.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw32XchgU},
+ {""},
+#line 153 "src/lexer-keywords.txt"
+ {"i16x8.add_saturate_s", TokenType::Binary, Opcode::I16X8AddSaturateS},
+ {""},
+#line 154 "src/lexer-keywords.txt"
+ {"i16x8.add_saturate_u", TokenType::Binary, Opcode::I16X8AddSaturateU},
+ {""}, {""},
#line 444 "src/lexer-keywords.txt"
{"i8x16.sub_saturate_s", TokenType::Binary, Opcode::I8X16SubSaturateS},
-#line 405 "src/lexer-keywords.txt"
- {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg},
+ {""},
#line 445 "src/lexer-keywords.txt"
{"i8x16.sub_saturate_u", TokenType::Binary, Opcode::I8X16SubSaturateU},
-#line 320 "src/lexer-keywords.txt"
- {"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU},
-#line 205 "src/lexer-keywords.txt"
- {"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU},
+#line 139 "src/lexer-keywords.txt"
+ {"f64x2.neg", TokenType::Unary, Opcode::F64X2Neg},
+ {""}, {""}, {""}, {""},
+#line 405 "src/lexer-keywords.txt"
+ {"i64x2.neg", TokenType::Unary, Opcode::I64X2Neg},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 141 "src/lexer-keywords.txt"
+ {"f64x2.replace_lane", TokenType::SimdLaneOp, Opcode::F64X2ReplaceLane},
+ {""}, {""},
+#line 377 "src/lexer-keywords.txt"
+ {"i64.popcnt", TokenType::Unary, Opcode::I64Popcnt},
+#line 249 "src/lexer-keywords.txt"
+ {"i32.popcnt", TokenType::Unary, Opcode::I32Popcnt},
+#line 406 "src/lexer-keywords.txt"
+ {"i64x2.replace_lane", TokenType::SimdLaneOp, Opcode::I64X2ReplaceLane},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 459 "src/lexer-keywords.txt"
+ {"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow},
+ {""}, {""},
+#line 465 "src/lexer-keywords.txt"
+ {"nan:arithmetic", TokenType::NanArithmetic},
{""},
#line 402 "src/lexer-keywords.txt"
{"i64x2.load32x2_s", TokenType::Load, Opcode::I64X2Load32X2S},
- {""},
-#line 515 "src/lexer-keywords.txt"
- {"anyfunc", Type::Funcref},
- {""},
+ {""}, {""},
+#line 414 "src/lexer-keywords.txt"
+ {"i8x16.add_saturate_s", TokenType::Binary, Opcode::I8X16AddSaturateS},
#line 403 "src/lexer-keywords.txt"
{"i64x2.load32x2_u", TokenType::Load, Opcode::I64X2Load32X2U},
+#line 415 "src/lexer-keywords.txt"
+ {"i8x16.add_saturate_u", TokenType::Binary, Opcode::I8X16AddSaturateU},
+ {""}, {""}, {""}, {""}, {""},
+#line 131 "src/lexer-keywords.txt"
+ {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane},
{""}, {""}, {""}, {""},
-#line 156 "src/lexer-keywords.txt"
- {"i16x8.all_true", TokenType::Unary, Opcode::I16X8AllTrue},
- {""}, {""}, {""}, {""},
-#line 334 "src/lexer-keywords.txt"
- {"i64.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XorU},
-#line 212 "src/lexer-keywords.txt"
- {"i32.atomic.rmw8.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XorU},
+#line 401 "src/lexer-keywords.txt"
+ {"i64x2.extract_lane", TokenType::SimdLaneOp, Opcode::I64X2ExtractLane},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 496 "src/lexer-keywords.txt"
+ {"try", TokenType::Try, Opcode::Try},
+#line 287 "src/lexer-keywords.txt"
+ {"i32x4.max_s", TokenType::Binary, Opcode::I32X4MaxS},
+ {""}, {""}, {""},
+#line 288 "src/lexer-keywords.txt"
+ {"i32x4.max_u", TokenType::Binary, Opcode::I32X4MaxU},
+#line 23 "src/lexer-keywords.txt"
+ {"assert_trap", TokenType::AssertTrap},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 462 "src/lexer-keywords.txt"
+ {"memory", TokenType::Memory},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 274 "src/lexer-keywords.txt"
+ {"i32x4.any_true", TokenType::Unary, Opcode::I32X4AnyTrue},
+ {""}, {""}, {""},
+#line 320 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XorU},
+#line 205 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw16.xor_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XorU},
+ {""},
+#line 26 "src/lexer-keywords.txt"
+ {"binary", TokenType::Bin},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 514 "src/lexer-keywords.txt"
+ {"v8x16.swizzle", TokenType::Binary, Opcode::V8X16Swizzle},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 81 "src/lexer-keywords.txt"
+ {"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq},
{""}, {""}, {""}, {""},
+#line 275 "src/lexer-keywords.txt"
+ {"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
#line 319 "src/lexer-keywords.txt"
{"i64.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw16XchgU},
#line 204 "src/lexer-keywords.txt"
{"i32.atomic.rmw16.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw16XchgU},
- {""}, {""}, {""},
-#line 186 "src/lexer-keywords.txt"
- {"i16x8.sub_saturate_s", TokenType::Binary, Opcode::I16X8SubSaturateS},
- {""},
-#line 187 "src/lexer-keywords.txt"
- {"i16x8.sub_saturate_u", TokenType::Binary, Opcode::I16X8SubSaturateU},
- {""}, {""}, {""}, {""},
-#line 443 "src/lexer-keywords.txt"
- {"i8x16.splat", TokenType::Unary, Opcode::I8X16Splat},
- {""},
-#line 513 "src/lexer-keywords.txt"
- {"v8x16.swizzle", TokenType::Binary, Opcode::V8X16Swizzle},
- {""}, {""}, {""},
-#line 305 "src/lexer-keywords.txt"
- {"i32x4.widen_low_i16x8_s", TokenType::Unary, Opcode::I32X4WidenLowI16X8S},
- {""},
-#line 306 "src/lexer-keywords.txt"
- {"i32x4.widen_low_i16x8_u", TokenType::Unary, Opcode::I32X4WidenLowI16X8U},
- {""}, {""},
-#line 131 "src/lexer-keywords.txt"
- {"f64x2.extract_lane", TokenType::SimdLaneOp, Opcode::F64X2ExtractLane},
- {""}, {""}, {""}, {""},
-#line 401 "src/lexer-keywords.txt"
- {"i64x2.extract_lane", TokenType::SimdLaneOp, Opcode::I64X2ExtractLane},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""},
-#line 185 "src/lexer-keywords.txt"
- {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""},
+#line 114 "src/lexer-keywords.txt"
+ {"f64.max", TokenType::Binary, Opcode::F64Max},
+#line 64 "src/lexer-keywords.txt"
+ {"f32.max", TokenType::Binary, Opcode::F32Max},
+ {""},
#line 250 "src/lexer-keywords.txt"
{"i32.reinterpret_f32", TokenType::Convert, Opcode::I32ReinterpretF32},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 378 "src/lexer-keywords.txt"
+ {"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64},
+#line 296 "src/lexer-keywords.txt"
+ {"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS},
+#line 164 "src/lexer-keywords.txt"
+ {"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS},
+#line 295 "src/lexer-keywords.txt"
+ {"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl},
+#line 165 "src/lexer-keywords.txt"
+ {"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU},
+#line 297 "src/lexer-keywords.txt"
+ {"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU},
{""}, {""},
-#line 414 "src/lexer-keywords.txt"
- {"i8x16.add_saturate_s", TokenType::Binary, Opcode::I8X16AddSaturateS},
+#line 162 "src/lexer-keywords.txt"
+ {"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS},
{""},
-#line 415 "src/lexer-keywords.txt"
- {"i8x16.add_saturate_u", TokenType::Binary, Opcode::I8X16AddSaturateU},
+#line 163 "src/lexer-keywords.txt"
+ {"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 378 "src/lexer-keywords.txt"
- {"i64.reinterpret_f64", TokenType::Convert, Opcode::I64ReinterpretF64},
+ {""}, {""}, {""},
+#line 40 "src/lexer-keywords.txt"
+ {"elem.drop", TokenType::ElemDrop, Opcode::ElemDrop},
+ {""}, {""}, {""},
+#line 36 "src/lexer-keywords.txt"
+ {"data.drop", TokenType::DataDrop, Opcode::DataDrop},
+#line 510 "src/lexer-keywords.txt"
+ {"v32x4.load_splat", TokenType::Load, Opcode::V32X4LoadSplat},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 301 "src/lexer-keywords.txt"
+ {"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S},
{""},
+#line 302 "src/lexer-keywords.txt"
+ {"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U},
#line 425 "src/lexer-keywords.txt"
{"i8x16.gt_s", TokenType::Compare, Opcode::I8X16GtS},
{""},
#line 426 "src/lexer-keywords.txt"
{"i8x16.gt_u", TokenType::Compare, Opcode::I8X16GtU},
- {""}, {""},
-#line 530 "src/lexer-keywords.txt"
- {"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32},
- {""},
+ {""}, {""}, {""},
#line 423 "src/lexer-keywords.txt"
{"i8x16.ge_s", TokenType::Compare, Opcode::I8X16GeS},
{""},
#line 424 "src/lexer-keywords.txt"
{"i8x16.ge_u", TokenType::Compare, Opcode::I8X16GeU},
-#line 485 "src/lexer-keywords.txt"
+ {""}, {""}, {""}, {""}, {""},
+#line 486 "src/lexer-keywords.txt"
{"table.copy", TokenType::TableCopy, Opcode::TableCopy},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 153 "src/lexer-keywords.txt"
- {"i16x8.add_saturate_s", TokenType::Binary, Opcode::I16X8AddSaturateS},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 531 "src/lexer-keywords.txt"
+ {"i32.reinterpret/f32", TokenType::Convert, Opcode::I32ReinterpretF32},
{""},
-#line 154 "src/lexer-keywords.txt"
- {"i16x8.add_saturate_u", TokenType::Binary, Opcode::I16X8AddSaturateU},
-#line 542 "src/lexer-keywords.txt"
+#line 90 "src/lexer-keywords.txt"
+ {"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg},
+ {""}, {""}, {""}, {""},
+#line 292 "src/lexer-keywords.txt"
+ {"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg},
+#line 543 "src/lexer-keywords.txt"
{"i64.reinterpret/f64", TokenType::Convert, Opcode::I64ReinterpretF64},
-#line 509 "src/lexer-keywords.txt"
- {"v32x4.load_splat", TokenType::Load, Opcode::V32X4LoadSplat},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 287 "src/lexer-keywords.txt"
- {"i32x4.max_s", TokenType::Binary, Opcode::I32X4MaxS},
- {""}, {""},
-#line 164 "src/lexer-keywords.txt"
- {"i16x8.gt_s", TokenType::Compare, Opcode::I16X8GtS},
-#line 288 "src/lexer-keywords.txt"
- {"i32x4.max_u", TokenType::Binary, Opcode::I32X4MaxU},
-#line 165 "src/lexer-keywords.txt"
- {"i16x8.gt_u", TokenType::Compare, Opcode::I16X8GtU},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 185 "src/lexer-keywords.txt"
+ {"i16x8.splat", TokenType::Unary, Opcode::I16X8Splat},
+ {""}, {""}, {""}, {""}, {""},
+#line 92 "src/lexer-keywords.txt"
+ {"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane},
+ {""}, {""}, {""}, {""},
+#line 294 "src/lexer-keywords.txt"
+ {"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 529 "src/lexer-keywords.txt"
+ {"get_global", TokenType::GlobalGet, Opcode::GlobalGet},
{""}, {""}, {""}, {""},
-#line 162 "src/lexer-keywords.txt"
- {"i16x8.ge_s", TokenType::Compare, Opcode::I16X8GeS},
- {""},
-#line 163 "src/lexer-keywords.txt"
- {"i16x8.ge_u", TokenType::Compare, Opcode::I16X8GeU},
-#line 114 "src/lexer-keywords.txt"
- {"f64.max", TokenType::Binary, Opcode::F64Max},
-#line 64 "src/lexer-keywords.txt"
- {"f32.max", TokenType::Binary, Opcode::F32Max},
- {""}, {""},
-#line 459 "src/lexer-keywords.txt"
- {"memory.grow", TokenType::MemoryGrow, Opcode::MemoryGrow},
- {""},
-#line 295 "src/lexer-keywords.txt"
- {"i32x4.shl", TokenType::Binary, Opcode::I32X4Shl},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
#line 271 "src/lexer-keywords.txt"
{"i32.wrap_i64", TokenType::Convert, Opcode::I32WrapI64},
- {""},
-#line 296 "src/lexer-keywords.txt"
- {"i32x4.shr_s", TokenType::Binary, Opcode::I32X4ShrS},
- {""}, {""}, {""},
-#line 297 "src/lexer-keywords.txt"
- {"i32x4.shr_u", TokenType::Binary, Opcode::I32X4ShrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 539 "src/lexer-keywords.txt"
- {"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""},
+#line 82 "src/lexer-keywords.txt"
+ {"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane},
+ {""}, {""}, {""}, {""},
+#line 276 "src/lexer-keywords.txt"
+ {"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane},
+ {""}, {""},
#line 341 "src/lexer-keywords.txt"
{"i64.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I64AtomicRmwXor},
#line 219 "src/lexer-keywords.txt"
{"i32.atomic.rmw.xor", TokenType::AtomicRmw, Opcode::I32AtomicRmwXor},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""},
-#line 495 "src/lexer-keywords.txt"
- {"try", TokenType::Try, Opcode::Try},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""},
-#line 528 "src/lexer-keywords.txt"
- {"get_global", TokenType::GlobalGet, Opcode::GlobalGet},
-#line 462 "src/lexer-keywords.txt"
- {"memory", TokenType::Memory},
- {""},
-#line 81 "src/lexer-keywords.txt"
- {"f32x4.eq", TokenType::Compare, Opcode::F32X4Eq},
- {""},
-#line 92 "src/lexer-keywords.txt"
- {"f32x4.replace_lane", TokenType::SimdLaneOp, Opcode::F32X4ReplaceLane},
+#line 283 "src/lexer-keywords.txt"
+ {"i32x4.load16x4_s", TokenType::Load, Opcode::I32X4Load16X4S},
{""}, {""},
-#line 275 "src/lexer-keywords.txt"
- {"i32x4.eq", TokenType::Compare, Opcode::I32X4Eq},
- {""},
-#line 294 "src/lexer-keywords.txt"
- {"i32x4.replace_lane", TokenType::SimdLaneOp, Opcode::I32X4ReplaceLane},
+#line 443 "src/lexer-keywords.txt"
+ {"i8x16.splat", TokenType::Unary, Opcode::I8X16Splat},
+#line 284 "src/lexer-keywords.txt"
+ {"i32x4.load16x4_u", TokenType::Load, Opcode::I32X4Load16X4U},
+ {""}, {""}, {""},
#line 136 "src/lexer-keywords.txt"
{"f64x2.max", TokenType::Binary, Opcode::F64X2Max},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 158 "src/lexer-keywords.txt"
+ {"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 26 "src/lexer-keywords.txt"
- {"binary", TokenType::Bin},
- {""}, {""},
-#line 419 "src/lexer-keywords.txt"
- {"i8x16.avgr_u", TokenType::Binary, Opcode::I8X16AvgrU},
- {""}, {""},
-#line 511 "src/lexer-keywords.txt"
- {"v8x16.load_splat", TokenType::Load, Opcode::V8X16LoadSplat},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 431 "src/lexer-keywords.txt"
- {"i8x16.max_s", TokenType::Binary, Opcode::I8X16MaxS},
{""}, {""}, {""},
-#line 432 "src/lexer-keywords.txt"
- {"i8x16.max_u", TokenType::Binary, Opcode::I8X16MaxU},
- {""}, {""}, {""}, {""}, {""},
-#line 90 "src/lexer-keywords.txt"
- {"f32x4.neg", TokenType::Unary, Opcode::F32X4Neg},
+#line 35 "src/lexer-keywords.txt"
+ {"current_memory", TokenType::MemorySize, Opcode::MemorySize},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""},
-#line 301 "src/lexer-keywords.txt"
- {"i32x4.trunc_sat_f32x4_s", TokenType::Unary, Opcode::I32X4TruncSatF32X4S},
-#line 292 "src/lexer-keywords.txt"
- {"i32x4.neg", TokenType::Unary, Opcode::I32X4Neg},
-#line 302 "src/lexer-keywords.txt"
- {"i32x4.trunc_sat_f32x4_u", TokenType::Unary, Opcode::I32X4TruncSatF32X4U},
- {""}, {""},
-#line 440 "src/lexer-keywords.txt"
- {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl},
- {""},
-#line 158 "src/lexer-keywords.txt"
- {"i16x8.avgr_u", TokenType::Binary, Opcode::I16X8AvgrU},
- {""}, {""},
-#line 508 "src/lexer-keywords.txt"
- {"v16x8.load_splat", TokenType::Load, Opcode::V16X8LoadSplat},
- {""}, {""}, {""}, {""}, {""},
-#line 274 "src/lexer-keywords.txt"
- {"i32x4.any_true", TokenType::Unary, Opcode::I32X4AnyTrue},
#line 172 "src/lexer-keywords.txt"
{"i16x8.max_s", TokenType::Binary, Opcode::I16X8MaxS},
{""}, {""}, {""},
#line 173 "src/lexer-keywords.txt"
{"i16x8.max_u", TokenType::Binary, Opcode::I16X8MaxU},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 441 "src/lexer-keywords.txt"
- {"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS},
- {""}, {""}, {""},
-#line 442 "src/lexer-keywords.txt"
- {"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU},
+ {""}, {""}, {""}, {""},
+#line 540 "src/lexer-keywords.txt"
+ {"i32.wrap/i64", TokenType::Convert, Opcode::I32WrapI64},
{""}, {""}, {""},
-#line 182 "src/lexer-keywords.txt"
- {"i16x8.shl", TokenType::Binary, Opcode::I16X8Shl},
+#line 419 "src/lexer-keywords.txt"
+ {"i8x16.avgr_u", TokenType::Binary, Opcode::I8X16AvgrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 25 "src/lexer-keywords.txt"
+ {"atomic.notify", TokenType::AtomicNotify, Opcode::AtomicNotify},
+#line 157 "src/lexer-keywords.txt"
+ {"i16x8.any_true", TokenType::Unary, Opcode::I16X8AnyTrue},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 431 "src/lexer-keywords.txt"
+ {"i8x16.max_s", TokenType::Binary, Opcode::I8X16MaxS},
{""}, {""}, {""},
-#line 82 "src/lexer-keywords.txt"
- {"f32x4.extract_lane", TokenType::SimdLaneOp, Opcode::F32X4ExtractLane},
+#line 432 "src/lexer-keywords.txt"
+ {"i8x16.max_u", TokenType::Binary, Opcode::I8X16MaxU},
{""}, {""}, {""}, {""},
-#line 276 "src/lexer-keywords.txt"
- {"i32x4.extract_lane", TokenType::SimdLaneOp, Opcode::I32X4ExtractLane},
+#line 159 "src/lexer-keywords.txt"
+ {"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 418 "src/lexer-keywords.txt"
+ {"i8x16.any_true", TokenType::Unary, Opcode::I8X16AnyTrue},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 420 "src/lexer-keywords.txt"
+ {"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq},
{""}, {""}, {""}, {""},
+#line 177 "src/lexer-keywords.txt"
+ {"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S},
#line 183 "src/lexer-keywords.txt"
{"i16x8.shr_s", TokenType::Binary, Opcode::I16X8ShrS},
- {""}, {""}, {""},
+#line 178 "src/lexer-keywords.txt"
+ {"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U},
+#line 182 "src/lexer-keywords.txt"
+ {"i16x8.shl", TokenType::Binary, Opcode::I16X8Shl},
+ {""},
#line 184 "src/lexer-keywords.txt"
{"i16x8.shr_u", TokenType::Binary, Opcode::I16X8ShrU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""},
-#line 512 "src/lexer-keywords.txt"
- {"v8x16.shuffle", TokenType::SimdShuffleOp, Opcode::V8X16Shuffle},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
#line 105 "src/lexer-keywords.txt"
{"f64.copysign", TokenType::Binary, Opcode::F64Copysign},
#line 54 "src/lexer-keywords.txt"
{"f32.copysign", TokenType::Binary, Opcode::F32Copysign},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""},
-#line 420 "src/lexer-keywords.txt"
- {"i8x16.eq", TokenType::Compare, Opcode::I8X16Eq},
- {""},
-#line 439 "src/lexer-keywords.txt"
- {"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""},
-#line 159 "src/lexer-keywords.txt"
- {"i16x8.eq", TokenType::Compare, Opcode::I16X8Eq},
- {""},
-#line 181 "src/lexer-keywords.txt"
- {"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane},
+#line 509 "src/lexer-keywords.txt"
+ {"v16x8.load_splat", TokenType::Load, Opcode::V16X8LoadSplat},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""},
+ {""}, {""}, {""}, {""}, {""},
#line 78 "src/lexer-keywords.txt"
{"f32x4.convert_i32x4_s", TokenType::Unary, Opcode::F32X4ConvertI32X4S},
{""},
#line 79 "src/lexer-keywords.txt"
{"f32x4.convert_i32x4_u", TokenType::Unary, Opcode::F32X4ConvertI32X4U},
{""}, {""}, {""},
-#line 437 "src/lexer-keywords.txt"
- {"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 192 "src/lexer-keywords.txt"
- {"i16x8.widen_low_i8x16_s", TokenType::Unary, Opcode::I16X8WidenLowI8X16S},
+#line 441 "src/lexer-keywords.txt"
+ {"i8x16.shr_s", TokenType::Binary, Opcode::I8X16ShrS},
{""},
-#line 193 "src/lexer-keywords.txt"
- {"i16x8.widen_low_i8x16_u", TokenType::Unary, Opcode::I16X8WidenLowI8X16U},
-#line 283 "src/lexer-keywords.txt"
- {"i32x4.load16x4_s", TokenType::Load, Opcode::I32X4Load16X4S},
- {""}, {""}, {""},
-#line 284 "src/lexer-keywords.txt"
- {"i32x4.load16x4_u", TokenType::Load, Opcode::I32X4Load16X4U},
-#line 418 "src/lexer-keywords.txt"
- {"i8x16.any_true", TokenType::Unary, Opcode::I8X16AnyTrue},
+#line 440 "src/lexer-keywords.txt"
+ {"i8x16.shl", TokenType::Binary, Opcode::I8X16Shl},
+ {""},
+#line 442 "src/lexer-keywords.txt"
+ {"i8x16.shr_u", TokenType::Binary, Opcode::I8X16ShrU},
{""}, {""}, {""},
#line 333 "src/lexer-keywords.txt"
{"i64.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I64AtomicRmw8XchgU},
#line 211 "src/lexer-keywords.txt"
{"i32.atomic.rmw8.xchg_u", TokenType::AtomicRmw, Opcode::I32AtomicRmw8XchgU},
- {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 337 "src/lexer-keywords.txt"
- {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg},
-#line 215 "src/lexer-keywords.txt"
- {"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg},
+#line 192 "src/lexer-keywords.txt"
+ {"i16x8.widen_low_i8x16_s", TokenType::Unary, Opcode::I16X8WidenLowI8X16S},
{""},
+#line 193 "src/lexer-keywords.txt"
+ {"i16x8.widen_low_i8x16_u", TokenType::Unary, Opcode::I16X8WidenLowI8X16U},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+#line 512 "src/lexer-keywords.txt"
+ {"v8x16.load_splat", TokenType::Load, Opcode::V8X16LoadSplat},
+ {""}, {""}, {""},
#line 179 "src/lexer-keywords.txt"
{"i16x8.neg", TokenType::Unary, Opcode::I16X8Neg},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""},
-#line 157 "src/lexer-keywords.txt"
- {"i16x8.any_true", TokenType::Unary, Opcode::I16X8AnyTrue},
- {""}, {""}, {""}, {""}, {""},
-#line 421 "src/lexer-keywords.txt"
- {"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS},
- {""},
-#line 422 "src/lexer-keywords.txt"
- {"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU},
{""}, {""}, {""}, {""},
-#line 35 "src/lexer-keywords.txt"
- {"current_memory", TokenType::MemorySize, Opcode::MemorySize},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""},
+#line 87 "src/lexer-keywords.txt"
+ {"f32x4.max", TokenType::Binary, Opcode::F32X4Max},
+ {""}, {""},
#line 168 "src/lexer-keywords.txt"
{"i16x8.load8x8_s", TokenType::Load, Opcode::I16X8Load8X8S},
{""},
#line 169 "src/lexer-keywords.txt"
{"i16x8.load8x8_u", TokenType::Load, Opcode::I16X8Load8X8U},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 181 "src/lexer-keywords.txt"
+ {"i16x8.replace_lane", TokenType::SimdLaneOp, Opcode::I16X8ReplaceLane},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 152 "src/lexer-keywords.txt"
+ {"grow_memory", TokenType::MemoryGrow, Opcode::MemoryGrow},
+ {""}, {""}, {""}, {""}, {""},
+#line 437 "src/lexer-keywords.txt"
+ {"i8x16.neg", TokenType::Unary, Opcode::I8X16Neg},
+ {""},
#line 160 "src/lexer-keywords.txt"
{"i16x8.extract_lane_s", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneS},
{""},
#line 161 "src/lexer-keywords.txt"
{"i16x8.extract_lane_u", TokenType::SimdLaneOp, Opcode::I16X8ExtractLaneU},
- {""}, {""}, {""}, {""}, {""}, {""},
-#line 25 "src/lexer-keywords.txt"
- {"atomic.notify", TokenType::AtomicNotify, Opcode::AtomicNotify},
- {""}, {""}, {""},
-#line 177 "src/lexer-keywords.txt"
- {"i16x8.narrow_i32x4_s", TokenType::Binary, Opcode::I16X8NarrowI32X4S},
-#line 87 "src/lexer-keywords.txt"
- {"f32x4.max", TokenType::Binary, Opcode::F32X4Max},
-#line 178 "src/lexer-keywords.txt"
- {"i16x8.narrow_i32x4_u", TokenType::Binary, Opcode::I16X8NarrowI32X4U},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+#line 513 "src/lexer-keywords.txt"
+ {"v8x16.shuffle", TokenType::SimdShuffleOp, Opcode::V8X16Shuffle},
+ {""}, {""},
+#line 439 "src/lexer-keywords.txt"
+ {"i8x16.replace_lane", TokenType::SimdLaneOp, Opcode::I8X16ReplaceLane},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""},
+#line 421 "src/lexer-keywords.txt"
+ {"i8x16.extract_lane_s", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneS},
+ {""},
+#line 422 "src/lexer-keywords.txt"
+ {"i8x16.extract_lane_u", TokenType::SimdLaneOp, Opcode::I8X16ExtractLaneU},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""},
-#line 152 "src/lexer-keywords.txt"
- {"grow_memory", TokenType::MemoryGrow, Opcode::MemoryGrow},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""},
+#line 337 "src/lexer-keywords.txt"
+ {"i64.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I64AtomicRmwCmpxchg},
+#line 215 "src/lexer-keywords.txt"
+ {"i32.atomic.rmw.cmpxchg", TokenType::AtomicRmwCmpxchg, Opcode::I32AtomicRmwCmpxchg},
+ {""}, {""}, {""}, {""}, {""},
#line 435 "src/lexer-keywords.txt"
{"i8x16.narrow_i16x8_s", TokenType::Binary, Opcode::I8X16NarrowI16X8S},
{""},
@@ -1516,6 +1522,11 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{"i8x16.narrow_i16x8_u", TokenType::Binary, Opcode::I8X16NarrowI16X8U},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+#line 457 "src/lexer-keywords.txt"
+ {"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -1524,7 +1535,7 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
#line 303 "src/lexer-keywords.txt"
{"i32x4.widen_high_i16x8_s", TokenType::Unary, Opcode::I32X4WidenHighI16X8S},
{""},
@@ -1538,19 +1549,10 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""},
-#line 457 "src/lexer-keywords.txt"
- {"memory.copy", TokenType::MemoryCopy, Opcode::MemoryCopy},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""},
-#line 190 "src/lexer-keywords.txt"
- {"i16x8.widen_high_i8x16_s", TokenType::Unary, Opcode::I16X8WidenHighI8X16S},
- {""},
-#line 191 "src/lexer-keywords.txt"
- {"i16x8.widen_high_i8x16_u", TokenType::Unary, Opcode::I16X8WidenHighI8X16U},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -1560,11 +1562,32 @@ Perfect_Hash::InWordSet (const char *str, size_t len)
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
{""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
- {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""},
#line 340 "src/lexer-keywords.txt"
{"i64.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I64AtomicRmwXchg},
#line 218 "src/lexer-keywords.txt"
- {"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg}
+ {"i32.atomic.rmw.xchg", TokenType::AtomicRmw, Opcode::I32AtomicRmwXchg},
+ {""}, {""}, {""}, {""}, {""}, {""},
+#line 190 "src/lexer-keywords.txt"
+ {"i16x8.widen_high_i8x16_s", TokenType::Unary, Opcode::I16X8WidenHighI8X16S},
+ {""},
+#line 191 "src/lexer-keywords.txt"
+ {"i16x8.widen_high_i8x16_u", TokenType::Unary, Opcode::I16X8WidenHighI8X16U}
};
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/src/shared-validator.cc b/src/shared-validator.cc
index e72a2a0b..1d251e2e 100644
--- a/src/shared-validator.cc
+++ b/src/shared-validator.cc
@@ -44,11 +44,11 @@ void SharedValidator::OnTypecheckerError(const char* msg) {
PrintError(*expr_loc_, "%s", msg);
}
-Result SharedValidator::OnType(const Location& loc,
- Index param_count,
- const Type* param_types,
- Index result_count,
- const Type* result_types) {
+Result SharedValidator::OnFuncType(const Location& loc,
+ Index param_count,
+ const Type* param_types,
+ Index result_count,
+ const Type* result_types) {
types_.push_back(FuncType{ToTypeVector(param_count, param_types),
ToTypeVector(result_count, result_types)});
return Result::Ok;
diff --git a/src/shared-validator.h b/src/shared-validator.h
index 40bde5ba..4ecaeabc 100644
--- a/src/shared-validator.h
+++ b/src/shared-validator.h
@@ -58,11 +58,11 @@ class SharedValidator {
Result EndModule();
- Result OnType(const Location&,
- Index param_count,
- const Type* param_types,
- Index result_count,
- const Type* result_types);
+ Result OnFuncType(const Location&,
+ Index param_count,
+ const Type* param_types,
+ Index result_count,
+ const Type* result_types);
Result OnFunction(const Location&, Var sig_var);
Result OnTable(const Location&, Type elem_type, const Limits&);
diff --git a/src/token.def b/src/token.def
index 8bd2f2db..9658bae0 100644
--- a/src/token.def
+++ b/src/token.def
@@ -54,6 +54,7 @@ WABT_TOKEN(Result, "result")
WABT_TOKEN(Rpar, ")")
WABT_TOKEN(Shared, "shared")
WABT_TOKEN(Start, "start")
+WABT_TOKEN(Struct, "struct")
WABT_TOKEN(Table, "table")
WABT_TOKEN(Then, "then")
WABT_TOKEN(Type, "type")
diff --git a/src/type.h b/src/type.h
index 4542ab99..a425c4a2 100644
--- a/src/type.h
+++ b/src/type.h
@@ -41,6 +41,7 @@ class Type {
Nullref = -0x12, // 0x6e
Exnref = -0x18, // 0x68
Func = -0x20, // 0x60
+ Struct = -0x21, // 0x5f
Void = -0x40, // 0x40
___ = Void, // Convenient for the opcode table in opcode.h
diff --git a/src/validator.cc b/src/validator.cc
index ef238292..e1d099a4 100644
--- a/src/validator.cc
+++ b/src/validator.cc
@@ -588,11 +588,16 @@ Result Validator::CheckModule() {
switch (f->type->kind()) {
case TypeEntryKind::Func: {
FuncType* func_type = cast<FuncType>(f->type.get());
- result_ |=
- validator_.OnType(field.loc, func_type->sig.param_types.size(),
- func_type->sig.param_types.data(),
- func_type->sig.result_types.size(),
- func_type->sig.result_types.data());
+ result_ |= validator_.OnFuncType(field.loc,
+ func_type->sig.param_types.size(),
+ func_type->sig.param_types.data(),
+ func_type->sig.result_types.size(),
+ func_type->sig.result_types.data());
+ break;
+ }
+
+ case TypeEntryKind::Struct: {
+ // TODO
break;
}
}
diff --git a/src/wast-parser.cc b/src/wast-parser.cc
index 6c9ca6ef..71d37ffe 100644
--- a/src/wast-parser.cc
+++ b/src/wast-parser.cc
@@ -261,7 +261,9 @@ void ResolveImplicitlyDefinedFunctionType(const Location& loc,
Index func_type_index = module->GetFuncTypeIndex(decl.sig);
if (func_type_index == kInvalidIndex) {
auto func_type_field = MakeUnique<TypeModuleField>(loc);
- cast<FuncType>(func_type_field->type.get())->sig = decl.sig;
+ auto func_type = MakeUnique<FuncType>();
+ func_type->sig = decl.sig;
+ func_type_field->type = std::move(func_type);
module->AppendField(std::move(func_type_field));
}
}
@@ -1182,16 +1184,34 @@ Result WastParser::ParseTypeModuleField(Module* module) {
WABT_TRACE(ParseTypeModuleField);
EXPECT(Lpar);
auto field = MakeUnique<TypeModuleField>(GetLocation());
- FuncType& func_type = *cast<FuncType>(field->type.get());
EXPECT(Type);
- ParseBindVarOpt(&func_type.name);
+
+ std::string name;
+ ParseBindVarOpt(&name);
EXPECT(Lpar);
- EXPECT(Func);
- BindingHash bindings;
- CHECK_RESULT(ParseFuncSignature(&func_type.sig, &bindings));
- CHECK_RESULT(ErrorIfLpar({"param", "result"}));
- EXPECT(Rpar);
- EXPECT(Rpar);
+ Location loc = GetLocation();
+
+ if (Match(TokenType::Func)) {
+ auto func_type = MakeUnique<FuncType>(name);
+ BindingHash bindings;
+ CHECK_RESULT(ParseFuncSignature(&func_type->sig, &bindings));
+ CHECK_RESULT(ErrorIfLpar({"param", "result"}));
+ EXPECT(Rpar);
+ EXPECT(Rpar);
+ field->type = std::move(func_type);
+ } else if (Match(TokenType::Struct)) {
+ if (!options_->features.gc_enabled()) {
+ Error(loc, "struct not allowed");
+ return Result::Error;
+ }
+ auto struct_type = MakeUnique<StructType>(name);
+ EXPECT(Rpar);
+ EXPECT(Rpar);
+ field->type = std::move(struct_type);
+ } else {
+ return ErrorExpected({"func", "struct"});
+ }
+
module->AppendField(std::move(field));
return Result::Ok;
}
diff --git a/src/wat-writer.cc b/src/wat-writer.cc
index 6c591989..639e7194 100644
--- a/src/wat-writer.cc
+++ b/src/wat-writer.cc
@@ -152,7 +152,7 @@ class WatWriter : ModuleContext {
void WriteDataSegment(const DataSegment& segment);
void WriteImport(const Import& import);
void WriteExport(const Export& export_);
- void WriteFuncType(const FuncType& func_type);
+ void WriteTypeEntry(const TypeEntry& type);
void WriteStartFunction(const Var& start);
class ExprVisitorDelegate;
@@ -184,7 +184,7 @@ class WatWriter : ModuleContext {
Index global_index_ = 0;
Index table_index_ = 0;
Index memory_index_ = 0;
- Index func_type_index_ = 0;
+ Index type_index_ = 0;
Index event_index_ = 0;
Index data_segment_index_ = 0;
Index elem_segment_index_ = 0;
@@ -1365,13 +1365,23 @@ void WatWriter::WriteExport(const Export& export_) {
WriteCloseNewline();
}
-void WatWriter::WriteFuncType(const FuncType& func_type) {
+void WatWriter::WriteTypeEntry(const TypeEntry& type) {
WriteOpenSpace("type");
- WriteNameOrIndex(func_type.name, func_type_index_++, NextChar::Space);
- WriteOpenSpace("func");
- WriteFuncSigSpace(func_type.sig);
- WriteCloseSpace();
- WriteCloseNewline();
+ WriteNameOrIndex(type.name, type_index_++, NextChar::Space);
+ switch (type.kind()) {
+ case TypeEntryKind::Func:
+ WriteOpenSpace("func");
+ WriteFuncSigSpace(cast<FuncType>(&type)->sig);
+ WriteCloseSpace();
+ WriteCloseNewline();
+ break;
+
+ case TypeEntryKind::Struct:
+ WriteOpenSpace("struct");
+ WriteCloseSpace();
+ WriteCloseNewline();
+ break;
+ }
}
void WatWriter::WriteStartFunction(const Var& start) {
@@ -1419,8 +1429,7 @@ Result WatWriter::WriteModule() {
WriteDataSegment(cast<DataSegmentModuleField>(&field)->data_segment);
break;
case ModuleFieldType::Type:
- WriteFuncType(
- *cast<FuncType>(cast<TypeModuleField>(&field)->type.get()));
+ WriteTypeEntry(*cast<TypeModuleField>(&field)->type);
break;
case ModuleFieldType::Start:
WriteStartFunction(cast<StartModuleField>(&field)->start);
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-13 07:52:53 +0000