beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 15:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

AK: Allow escaping of keys in SourceGenerator

Browse source 
This allows the opening and closing characters of the SourceGenerator
to be used in the source text to be used for purposes other than keys.
This commit is contained in:
Tim Ledbetter 2024-07-07 19:54:59 +01:00 committed by Andreas Kling
parent fe551d3eff
commit 634f2f655b
Notes: sideshowbarker 2024-07-17 04:57:23 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/LadybirdBrowser/ladybird/commit/634f2f655b
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/494
Reviewed-by: https://github.com/jamierocks
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
AK/SourceGenerator.h
View file

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 2020, the SerenityOS developers. * Copyright (c) 2020, the SerenityOS developers.
* Copyright (c) 2023, Sam Atkins <atkinssj@serenityos.org> * Copyright (c) 2023, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2024, Tim Ledbetter <timledbetter@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -21,17 +22,19 @@ class SourceGenerator {
public: public:
using MappingType = HashMap<StringView, String>; using MappingType = HashMap<StringView, String>;
explicit SourceGenerator(StringBuilder& builder, char opening = '@', char closing = '@') explicit SourceGenerator(StringBuilder& builder, char opening = '@', char closing = '@', char escape = '\\')
: m_builder(builder) : m_builder(builder)
, m_opening(opening) , m_opening(opening)
, m_closing(closing) , m_closing(closing)
, m_escape(escape)
{ {
} }
explicit SourceGenerator(StringBuilder& builder, MappingType&& mapping, char opening = '@', char closing = '@') explicit SourceGenerator(StringBuilder& builder, MappingType&& mapping, char opening = '@', char closing = '@', char escape = '\\')
: m_builder(builder) : m_builder(builder)
, m_mapping(move(mapping)) , m_mapping(move(mapping))
, m_opening(opening) , m_opening(opening)
, m_closing(closing) , m_closing(closing)
, m_escape(escape)
{ {
} }
@ -70,7 +73,20 @@ public:
GenericLexer lexer { pattern }; GenericLexer lexer { pattern };
while (!lexer.is_eof()) { while (!lexer.is_eof()) {
m_builder.append(lexer.consume_until(m_opening)); m_builder.append(lexer.consume_until([&](char ch) { return ch == m_opening || ch == m_escape; }));
if (lexer.consume_specific(m_escape)) {
if (!(lexer.next_is(m_opening) || lexer.next_is(m_escape))) {
if (lexer.is_eof())
warnln("Unexpected EOF while parsing escape sequence on SourceGenerator");
else
warnln("Invalid escape sequence found `{}{}` on SourceGenerator", m_escape, lexer.peek());
VERIFY_NOT_REACHED();
}
m_builder.append(lexer.consume());
continue;
}
if (lexer.consume_specific(m_opening)) { if (lexer.consume_specific(m_opening)) {
auto const placeholder = lexer.consume_until(m_closing); auto const placeholder = lexer.consume_until(m_closing);
@ -129,7 +145,9 @@ public:
private: private:
StringBuilder& m_builder; StringBuilder& m_builder;
MappingType m_mapping; MappingType m_mapping;
char m_opening, m_closing; char m_opening { '@' };
char m_closing { '@' };
char m_escape { '\\' };
}; };
} }