Skip to content

[Parser][NFC] Remove Token from lexer interface #6333

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2024
Merged

[Parser][NFC] Remove Token from lexer interface #6333

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 38 additions & 34 deletions src/parser/lexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,42 +168,41 @@ struct Lexer {
advance();
}

std::optional<Token> peek() const { return curr; }

bool takeLParen() {
auto t = peek();
if (!t || !t->isLParen()) {
if (!curr || !curr->isLParen()) {
return false;
}
advance();
return true;
}

bool peekLParen() { return Lexer(*this).takeLParen(); }

bool takeRParen() {
auto t = peek();
if (!t || !t->isRParen()) {
if (!curr || !curr->isRParen()) {
return false;
}
advance();
return true;
}

bool peekRParen() { return Lexer(*this).takeRParen(); }

bool takeUntilParen() {
while (true) {
auto t = peek();
if (!t) {
if (!curr) {
return false;
}
if (t->isLParen() || t->isRParen()) {
if (curr->isLParen() || curr->isRParen()) {
return true;
}
advance();
}
}

std::optional<Name> takeID() {
if (auto t = peek()) {
if (auto id = t->getID()) {
if (curr) {
if (auto id = curr->getID()) {
advance();
// See comment on takeName.
return Name(std::string(*id));
Expand All @@ -213,18 +212,22 @@ struct Lexer {
}

std::optional<std::string_view> takeKeyword() {
if (auto t = peek()) {
if (auto keyword = t->getKeyword()) {
if (curr) {
if (auto keyword = curr->getKeyword()) {
advance();
return *keyword;
}
}
return {};
}

std::optional<std::string_view> peekKeyword() {
return Lexer(*this).takeKeyword();
}

bool takeKeyword(std::string_view expected) {
if (auto t = peek()) {
if (auto keyword = t->getKeyword()) {
if (curr) {
if (auto keyword = curr->getKeyword()) {
if (*keyword == expected) {
advance();
return true;
Expand All @@ -236,16 +239,16 @@ struct Lexer {

std::optional<uint64_t> takeOffset() {
using namespace std::string_view_literals;
if (auto t = peek()) {
if (auto keyword = t->getKeyword()) {
if (curr) {
if (auto keyword = curr->getKeyword()) {
if (keyword->substr(0, 7) != "offset="sv) {
return {};
}
Lexer subLexer(keyword->substr(7));
if (subLexer.empty()) {
return {};
}
if (auto o = subLexer.peek()->getU<uint64_t>()) {
if (auto o = subLexer.curr->getU<uint64_t>()) {
subLexer.advance();
if (subLexer.empty()) {
advance();
Expand All @@ -259,16 +262,16 @@ struct Lexer {

std::optional<uint32_t> takeAlign() {
using namespace std::string_view_literals;
if (auto t = peek()) {
if (auto keyword = t->getKeyword()) {
if (curr) {
if (auto keyword = curr->getKeyword()) {
if (keyword->substr(0, 6) != "align="sv) {
return {};
}
Lexer subLexer(keyword->substr(6));
if (subLexer.empty()) {
return {};
}
if (auto a = subLexer.peek()->getU<uint32_t>()) {
if (auto a = subLexer.curr->getU<uint32_t>()) {
subLexer.advance();
if (subLexer.empty()) {
advance();
Expand All @@ -281,8 +284,8 @@ struct Lexer {
}

template<typename T> std::optional<T> takeU() {
if (auto t = peek()) {
if (auto n = t->getU<T>()) {
if (curr) {
if (auto n = curr->getU<T>()) {
advance();
return n;
}
Expand All @@ -291,8 +294,8 @@ struct Lexer {
}

template<typename T> std::optional<T> takeI() {
if (auto t = peek()) {
if (auto n = t->getI<T>()) {
if (curr) {
if (auto n = curr->getI<T>()) {
advance();
return n;
}
Expand All @@ -315,8 +318,8 @@ struct Lexer {
std::optional<uint8_t> takeI8() { return takeI<uint8_t>(); }

std::optional<double> takeF64() {
if (auto t = peek()) {
if (auto d = t->getF64()) {
if (curr) {
if (auto d = curr->getF64()) {
advance();
return d;
}
Expand All @@ -325,8 +328,8 @@ struct Lexer {
}

std::optional<float> takeF32() {
if (auto t = peek()) {
if (auto f = t->getF32()) {
if (curr) {
if (auto f = curr->getF32()) {
advance();
return f;
}
Expand All @@ -335,10 +338,11 @@ struct Lexer {
}

std::optional<std::string> takeString() {
if (auto t = peek()) {
if (auto s = t->getString()) {
if (curr) {
if (auto s = curr->getString()) {
std::string ret(*s);
advance();
return std::string(*s);
return ret;
}
}
return {};
Expand Down Expand Up @@ -392,8 +396,8 @@ struct Lexer {
TextPos position() const { return position(getPos()); }

size_t getPos() const {
if (auto t = peek()) {
return getIndex() - t->span.size();
if (curr) {
return getIndex() - curr->span.size();
}
return getIndex();
}
Expand Down
18 changes: 8 additions & 10 deletions src/parser/parsers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ template<typename Ctx> Result<typename Ctx::FieldT> fieldtype(Ctx& ctx) {
template<typename Ctx> Result<typename Ctx::FieldsT> fields(Ctx& ctx) {
auto res = ctx.makeFields();
while (true) {
if (auto t = ctx.in.peek(); !t || t->isRParen()) {
if (ctx.in.empty() || ctx.in.peekRParen()) {
return res;
}
if (ctx.in.takeSExprStart("field")) {
Expand Down Expand Up @@ -754,13 +754,11 @@ template<typename Ctx> MaybeResult<> plaininstr(Ctx& ctx) {
// instr ::= plaininstr | blockinstr
template<typename Ctx> MaybeResult<> instr(Ctx& ctx) {
// Check for valid strings that are not instructions.
if (auto tok = ctx.in.peek()) {
if (auto keyword = tok->getKeyword()) {
if (keyword == "end"sv || keyword == "then"sv || keyword == "else"sv ||
keyword == "catch"sv || keyword == "catch_all"sv ||
keyword == "delegate"sv || keyword == "ref"sv) {
return {};
}
if (auto keyword = ctx.in.peekKeyword()) {
if (keyword == "end"sv || keyword == "then"sv || keyword == "else"sv ||
keyword == "catch"sv || keyword == "catch_all"sv ||
keyword == "delegate"sv || keyword == "ref"sv) {
return {};
}
}
if (auto inst = blockinstr(ctx)) {
Expand All @@ -775,7 +773,7 @@ template<typename Ctx> MaybeResult<> instr(Ctx& ctx) {

template<typename Ctx> MaybeResult<> foldedinstr(Ctx& ctx) {
// We must have an '(' to start a folded instruction.
if (auto tok = ctx.in.peek(); !tok || !tok->isLParen()) {
if (!ctx.in.peekLParen()) {
return {};
}

Expand Down Expand Up @@ -2965,7 +2963,7 @@ template<typename Ctx> MaybeResult<> tag(Ctx& ctx) {
// | data
// | tag
template<typename Ctx> MaybeResult<> modulefield(Ctx& ctx) {
if (auto t = ctx.in.peek(); !t || t->isRParen()) {
if (ctx.in.empty() || ctx.in.peekRParen()) {
return {};
}
if (auto res = deftype(ctx)) {
Expand Down