diff options
Diffstat (limited to 'src/wast-parser.cc')
| -rw-r--r-- | src/wast-parser.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/wast-parser.cc b/src/wast-parser.cc index 5d3a72c3..66898a2f 100644 --- a/src/wast-parser.cc +++ b/src/wast-parser.cc @@ -187,7 +187,7 @@ bool IsModuleField(TokenTypePair pair) { switch (pair[1]) { case TokenType::Data: case TokenType::Elem: - case TokenType::Except: + case TokenType::Event: case TokenType::Export: case TokenType::Func: case TokenType::Type: @@ -780,7 +780,7 @@ Result WastParser::ParseModuleField(Module* module) { switch (Peek(1)) { case TokenType::Data: return ParseDataModuleField(module); case TokenType::Elem: return ParseElemModuleField(module); - case TokenType::Except: return ParseExceptModuleField(module); + case TokenType::Event: return ParseEventModuleField(module); case TokenType::Export: return ParseExportModuleField(module); case TokenType::Func: return ParseFuncModuleField(module); case TokenType::Type: return ParseTypeModuleField(module); @@ -840,13 +840,13 @@ Result WastParser::ParseElemModuleField(Module* module) { return Result::Ok; } -Result WastParser::ParseExceptModuleField(Module* module) { - WABT_TRACE(ParseExceptModuleField); +Result WastParser::ParseEventModuleField(Module* module) { + WABT_TRACE(ParseEventModuleField); EXPECT(Lpar); - auto field = MakeUnique<ExceptionModuleField>(GetLocation()); - EXPECT(Except); - ParseBindVarOpt(&field->except.name); - CHECK_RESULT(ParseValueTypeList(&field->except.sig)); + auto field = MakeUnique<EventModuleField>(GetLocation()); + EXPECT(Event); + ParseBindVarOpt(&field->event.name); + CHECK_RESULT(ParseValueTypeList(&field->event.sig)); EXPECT(Rpar); module->AppendField(std::move(field)); return Result::Ok; @@ -1019,11 +1019,11 @@ Result WastParser::ParseImportModuleField(Module* module) { break; } - case TokenType::Except: { + case TokenType::Event: { Consume(); ParseBindVarOpt(&name); - auto import = MakeUnique<ExceptionImport>(name); - CHECK_RESULT(ParseValueTypeList(&import->except.sig)); + auto import = MakeUnique<EventImport>(name); + CHECK_RESULT(ParseValueTypeList(&import->event.sig)); EXPECT(Rpar); field = MakeUnique<ImportModuleField>(std::move(import), loc); break; @@ -1161,7 +1161,7 @@ Result WastParser::ParseExportDesc(Export* export_) { case TokenType::Table: export_->kind = ExternalKind::Table; break; case TokenType::Memory: export_->kind = ExternalKind::Memory; break; case TokenType::Global: export_->kind = ExternalKind::Global; break; - case TokenType::Except: export_->kind = ExternalKind::Except; break; + case TokenType::Event: export_->kind = ExternalKind::Event; break; default: return ErrorExpected({"an external kind"}); } @@ -2331,7 +2331,7 @@ void WastParser::CheckImportOrdering(Module* module) { module->tables.size() != module->num_table_imports || module->memories.size() != module->num_memory_imports || module->globals.size() != module->num_global_imports || - module->excepts.size() != module->num_except_imports) { + module->events.size() != module->num_event_imports) { Error(GetLocation(), "imports must occur before all non-import definitions"); } |