Skip to content

[llvm][mustache] Refactor tokenizer for clarity #159188

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
Sep 30, 2025
Merged

[llvm][mustache] Refactor tokenizer for clarity #159188

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
49 changes: 27 additions & 22 deletions llvm/lib/Support/Mustache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,11 +560,34 @@ class Parser {
llvm::StringMap<SectionLambda> &SectionLambdas,
EscapeMap &Escapes);

void parseSection(ASTNode *Parent, ASTNode::Type Ty, const Accessor &A,
llvm::StringMap<AstPtr> &Partials,
llvm::StringMap<Lambda> &Lambdas,
llvm::StringMap<SectionLambda> &SectionLambdas,
EscapeMap &Escapes);

SmallVector<Token> Tokens;
size_t CurrentPtr;
StringRef TemplateStr;
};

void Parser::parseSection(ASTNode *Parent, ASTNode::Type Ty, const Accessor &A,
llvm::StringMap<AstPtr> &Partials,
llvm::StringMap<Lambda> &Lambdas,
llvm::StringMap<SectionLambda> &SectionLambdas,
EscapeMap &Escapes) {
AstPtr CurrentNode =
createNode(Ty, A, Parent, Partials, Lambdas, SectionLambdas, Escapes);
size_t Start = CurrentPtr;
parseMustache(CurrentNode.get(), Partials, Lambdas, SectionLambdas, Escapes);
const size_t End = CurrentPtr - 1;
std::string RawBody;
for (std::size_t I = Start; I < End; I++)
RawBody += Tokens[I].RawBody;
CurrentNode->setRawBody(std::move(RawBody));
Parent->addChild(std::move(CurrentNode));
}

AstPtr Parser::parse(llvm::StringMap<AstPtr> &Partials,
llvm::StringMap<Lambda> &Lambdas,
llvm::StringMap<SectionLambda> &SectionLambdas,
Expand Down Expand Up @@ -614,31 +637,13 @@ void Parser::parseMustache(ASTNode *Parent, llvm::StringMap<AstPtr> &Partials,
break;
}
case Token::Type::SectionOpen: {
CurrentNode = createNode(ASTNode::Section, A, Parent, Partials, Lambdas,
SectionLambdas, Escapes);
size_t Start = CurrentPtr;
parseMustache(CurrentNode.get(), Partials, Lambdas, SectionLambdas,
Escapes);
const size_t End = CurrentPtr - 1;
std::string RawBody;
for (std::size_t I = Start; I < End; I++)
RawBody += Tokens[I].RawBody;
CurrentNode->setRawBody(std::move(RawBody));
Parent->addChild(std::move(CurrentNode));
parseSection(Parent, ASTNode::Section, A, Partials, Lambdas,
SectionLambdas, Escapes);
break;
}
case Token::Type::InvertSectionOpen: {
CurrentNode = createNode(ASTNode::InvertSection, A, Parent, Partials,
Lambdas, SectionLambdas, Escapes);
size_t Start = CurrentPtr;
parseMustache(CurrentNode.get(), Partials, Lambdas, SectionLambdas,
Escapes);
const size_t End = CurrentPtr - 1;
std::string RawBody;
for (size_t Idx = Start; Idx < End; Idx++)
RawBody += Tokens[Idx].RawBody;
CurrentNode->setRawBody(std::move(RawBody));
Parent->addChild(std::move(CurrentNode));
parseSection(Parent, ASTNode::InvertSection, A, Partials, Lambdas,
SectionLambdas, Escapes);
break;
}
case Token::Type::Comment:
Expand Down