summaryrefslogtreecommitdiff
path: root/src/wast-parser.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/wast-parser.cc')
-rw-r--r--src/wast-parser.cc65
1 files changed, 35 insertions, 30 deletions
diff --git a/src/wast-parser.cc b/src/wast-parser.cc
index a9a53973..82074da9 100644
--- a/src/wast-parser.cc
+++ b/src/wast-parser.cc
@@ -32,6 +32,8 @@ namespace wabt {
namespace {
+static const size_t kMaxErrorTokenLength = 80;
+
bool IsPowerOfTwo(uint32_t x) {
return x && ((x & (x - 1)) == 0);
}
@@ -322,7 +324,7 @@ Location WastParser::GetLocation() {
TokenType WastParser::Peek(size_t n) {
while (tokens_.size() <= n)
tokens_.push_back(lexer_->GetToken(this));
- return tokens_.at(n).token_type;
+ return tokens_.at(n).token_type();
}
TokenTypePair WastParser::PeekPair() {
@@ -362,7 +364,8 @@ Result WastParser::Expect(TokenType type) {
if (!Match(type)) {
Token token = Consume();
Error(token.loc, "unexpected token %s, expected %s.",
- token.to_string().c_str(), GetTokenTypeName(type));
+ token.to_string_clamp(kMaxErrorTokenLength).c_str(),
+ GetTokenTypeName(type));
return Result::Error;
}
@@ -383,8 +386,9 @@ Result WastParser::Synchronize(SynchronizeFunc func) {
return Result::Ok;
Token token = Consume();
- if (token.token_type == TokenType::Reserved) {
- Error(token.loc, "unexpected token %s.", token.to_string().c_str());
+ if (token.token_type() == TokenType::Reserved) {
+ Error(token.loc, "unexpected token %s.",
+ token.to_string_clamp(kMaxErrorTokenLength).c_str());
}
}
@@ -392,7 +396,7 @@ Result WastParser::Synchronize(SynchronizeFunc func) {
}
void WastParser::ErrorUnlessOpcodeEnabled(const Token& token) {
- Opcode opcode = token.opcode;
+ Opcode opcode = token.opcode();
if (!opcode.IsEnabled(options_->features))
Error(token.loc, "opcode not allowed: %s", opcode.GetName());
}
@@ -421,7 +425,8 @@ Result WastParser::ErrorExpected(const std::vector<std::string>& expected,
}
}
- Error(token.loc, "unexpected token \"%s\"%s.", token.to_string().c_str(),
+ Error(token.loc, "unexpected token \"%s\"%s.",
+ token.to_string_clamp(kMaxErrorTokenLength).c_str(),
expected_str.c_str());
return Result::Error;
}
@@ -437,7 +442,7 @@ void WastParser::ParseBindVarOpt(std::string* name) {
WABT_TRACE(ParseBindVarOpt);
if (PeekMatch(TokenType::Var)) {
Token token = Consume();
- *name = token.text.to_string();
+ *name = token.text();
}
}
@@ -445,7 +450,7 @@ Result WastParser::ParseVar(Var* out_var) {
WABT_TRACE(ParseVar);
if (PeekMatch(TokenType::Nat)) {
Token token = Consume();
- string_view sv = token.literal.text.to_string_view();
+ string_view sv = token.literal().text;
uint64_t index = kInvalidIndex;
if (Failed(ParseUint64(sv.begin(), sv.end(), &index))) {
// Print an error, but don't fail parsing.
@@ -457,7 +462,7 @@ Result WastParser::ParseVar(Var* out_var) {
return Result::Ok;
} else if (PeekMatch(TokenType::Var)) {
Token token = Consume();
- *out_var = Var(token.text.to_string_view(), token.loc);
+ *out_var = Var(token.text(), token.loc);
return Result::Ok;
} else {
return ErrorExpected({"a numeric index", "a name"}, "12 or $foo");
@@ -505,7 +510,7 @@ bool WastParser::ParseTextListOpt(std::vector<uint8_t>* out_data) {
WABT_TRACE(ParseTextListOpt);
TextVector texts;
while (PeekMatch(TokenType::Text))
- texts.push_back(Consume().text.to_string());
+ texts.push_back(Consume().text());
RemoveEscapes(texts, std::back_inserter(*out_data));
return !texts.empty();
@@ -534,14 +539,14 @@ Result WastParser::ParseValueType(Type* out_type) {
if (!PeekMatch(TokenType::ValueType))
return ErrorExpected({"i32", "i64", "f32", "f64"});
- *out_type = Consume().type;
+ *out_type = Consume().type();
return Result::Ok;
}
Result WastParser::ParseValueTypeList(TypeVector* out_type_list) {
WABT_TRACE(ParseValueTypeList);
while (PeekMatch(TokenType::ValueType))
- out_type_list->push_back(Consume().type);
+ out_type_list->push_back(Consume().type());
CHECK_RESULT(ErrorIfLpar({"i32", "i64", "f32", "f64"}));
return Result::Ok;
@@ -552,7 +557,7 @@ Result WastParser::ParseQuotedText(std::string* text) {
if (!PeekMatch(TokenType::Text))
return ErrorExpected({"a quoted string"}, "\"foo\"");
- RemoveEscapes(Consume().text.to_string_view(), std::back_inserter(*text));
+ RemoveEscapes(Consume().text(), std::back_inserter(*text));
return Result::Ok;
}
@@ -561,7 +566,7 @@ bool WastParser::ParseOffsetOpt(uint32_t* out_offset) {
if (PeekMatch(TokenType::OffsetEqNat)) {
Token token = Consume();
uint64_t offset64;
- string_view sv = token.text.to_string_view();
+ string_view sv = token.text();
if (Failed(ParseInt64(sv.begin(), sv.end(), &offset64,
ParseIntType::SignedAndUnsigned))) {
Error(token.loc, "invalid offset \"" PRIstringview "\"",
@@ -583,7 +588,7 @@ bool WastParser::ParseAlignOpt(uint32_t* out_align) {
WABT_TRACE(ParseAlignOpt);
if (PeekMatch(TokenType::AlignEqNat)) {
Token token = Consume();
- string_view sv = token.text.to_string_view();
+ string_view sv = token.text();
if (Failed(ParseInt32(sv.begin(), sv.end(), out_align,
ParseIntType::UnsignedOnly))) {
Error(token.loc, "invalid alignment \"" PRIstringview "\"",
@@ -621,7 +626,7 @@ Result WastParser::ParseNat(uint64_t* out_nat) {
return ErrorExpected({"a natural number"}, "123");
Token token = Consume();
- string_view sv = token.literal.text.to_string_view();
+ string_view sv = token.literal().text;
if (Failed(ParseUint64(sv.begin(), sv.end(), out_nat))) {
Error(token.loc, "invalid int \"" PRIstringview "\"",
WABT_PRINTF_STRING_VIEW_ARG(sv));
@@ -1289,7 +1294,7 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
break;
case TokenType::Load: {
- Opcode opcode = Consume().opcode;
+ Opcode opcode = Consume().opcode();
uint32_t offset;
uint32_t align;
ParseOffsetOpt(&offset);
@@ -1299,7 +1304,7 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
}
case TokenType::Store: {
- Opcode opcode = Consume().opcode;
+ Opcode opcode = Consume().opcode();
uint32_t offset;
uint32_t align;
ParseOffsetOpt(&offset);
@@ -1318,22 +1323,22 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
case TokenType::Unary: {
Token token = Consume();
ErrorUnlessOpcodeEnabled(token);
- out_expr->reset(new UnaryExpr(token.opcode, loc));
+ out_expr->reset(new UnaryExpr(token.opcode(), loc));
break;
}
case TokenType::Binary:
- out_expr->reset(new BinaryExpr(Consume().opcode, loc));
+ out_expr->reset(new BinaryExpr(Consume().opcode(), loc));
break;
case TokenType::Compare:
- out_expr->reset(new CompareExpr(Consume().opcode, loc));
+ out_expr->reset(new CompareExpr(Consume().opcode(), loc));
break;
case TokenType::Convert: {
Token token = Consume();
ErrorUnlessOpcodeEnabled(token);
- out_expr->reset(new ConvertExpr(token.opcode, loc));
+ out_expr->reset(new ConvertExpr(token.opcode(), loc));
break;
}
@@ -1368,8 +1373,8 @@ Result WastParser::ParsePlainInstr(std::unique_ptr<Expr>* out_expr) {
Result WastParser::ParseConst(Const* const_) {
WABT_TRACE(ParseConst);
- Opcode opcode = Consume().opcode;
- LiteralTerminal literal;
+ Opcode opcode = Consume().opcode();
+ Literal literal;
Location loc = GetLocation();
@@ -1377,14 +1382,14 @@ Result WastParser::ParseConst(Const* const_) {
case TokenType::Nat:
case TokenType::Int:
case TokenType::Float:
- literal = Consume().literal;
+ literal = Consume().literal();
break;
default:
return ErrorExpected({"a numeric literal"}, "123, -45, 6.7e8");
}
- string_view sv = literal.text.to_string_view();
+ string_view sv = literal.text;
const char* s = sv.begin();
const char* end = sv.end();
@@ -1418,7 +1423,7 @@ Result WastParser::ParseConst(Const* const_) {
}
if (Failed(result)) {
- Error(loc, "invalid literal \"%s\"", literal.text.to_string().c_str());
+ Error(loc, "invalid literal \"%s\"", literal.text.c_str());
}
return Result::Ok;
@@ -1505,7 +1510,7 @@ Result WastParser::ParseBlockInstr(std::unique_ptr<Expr>* out_expr) {
Result WastParser::ParseLabelOpt(std::string* out_label) {
WABT_TRACE(ParseLabelOpt);
if (PeekMatch(TokenType::Var)) {
- *out_label = Consume().text.to_string();
+ *out_label = Consume().text();
} else {
out_label->clear();
}
@@ -1652,7 +1657,7 @@ Result WastParser::ParseCatchInstrList(CatchVector* catches) {
while (IsCatch(Peek())) {
Catch catch_(GetLocation());
- if (Consume().token_type == TokenType::Catch)
+ if (Consume().token_type() == TokenType::Catch)
CHECK_RESULT(ParseVar(&catch_.var));
CHECK_RESULT(ParseInstrList(&catch_.exprs));
@@ -1668,7 +1673,7 @@ Result WastParser::ParseCatchExprList(CatchVector* catches) {
Consume();
Catch catch_(GetLocation());
- if (Consume().token_type == TokenType::Catch)
+ if (Consume().token_type() == TokenType::Catch)
CHECK_RESULT(ParseVar(&catch_.var));
CHECK_RESULT(ParseTerminatingInstrList(&catch_.exprs));
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-09 10:33:44 +0000