summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AK/GenericLexer.cpp9
-rw-r--r--Kernel/FileSystem/VirtualFileSystem.cpp2
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp5
-rw-r--r--Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp6
-rw-r--r--Userland/Libraries/LibC/scanf.cpp1
-rw-r--r--Userland/Libraries/LibCpp/Preprocessor.cpp7
-rw-r--r--Userland/Utilities/lsof.cpp2
7 files changed, 18 insertions, 14 deletions
diff --git a/AK/GenericLexer.cpp b/AK/GenericLexer.cpp
index 05bd6ebb95..8a55451daf 100644
--- a/AK/GenericLexer.cpp
+++ b/AK/GenericLexer.cpp
@@ -53,7 +53,6 @@ StringView GenericLexer::consume_line()
}
// Consume and return characters until `stop` is peek'd
-// The `stop` character is ignored, as it is user-defined
StringView GenericLexer::consume_until(char stop)
{
size_t start = m_index;
@@ -61,15 +60,12 @@ StringView GenericLexer::consume_until(char stop)
m_index++;
size_t length = m_index - start;
- ignore();
-
if (length == 0)
return {};
return m_input.substring_view(start, length);
}
// Consume and return characters until the string `stop` is found
-// The `stop` string is ignored, as it is user-defined
StringView GenericLexer::consume_until(const char* stop)
{
size_t start = m_index;
@@ -77,15 +73,12 @@ StringView GenericLexer::consume_until(const char* stop)
m_index++;
size_t length = m_index - start;
- ignore(__builtin_strlen(stop));
-
if (length == 0)
return {};
return m_input.substring_view(start, length);
}
// Consume and return characters until the string `stop` is found
-// The `stop` string is ignored, as it is user-defined
StringView GenericLexer::consume_until(StringView stop)
{
size_t start = m_index;
@@ -93,8 +86,6 @@ StringView GenericLexer::consume_until(StringView stop)
m_index++;
size_t length = m_index - start;
- ignore(stop.length());
-
if (length == 0)
return {};
return m_input.substring_view(start, length);
diff --git a/Kernel/FileSystem/VirtualFileSystem.cpp b/Kernel/FileSystem/VirtualFileSystem.cpp
index 873d71535e..8a4f68737b 100644
--- a/Kernel/FileSystem/VirtualFileSystem.cpp
+++ b/Kernel/FileSystem/VirtualFileSystem.cpp
@@ -865,7 +865,7 @@ ErrorOr<NonnullRefPtr<Custody>> VirtualFileSystem::resolve_path_without_veil(Str
if (path_lexer.is_eof())
extra_iteration = false;
auto part = path_lexer.consume_until('/');
- path_lexer.consume_specific('/');
+ path_lexer.ignore();
Custody& parent = custody;
auto parent_metadata = parent.inode().metadata();
diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp
index 6c4b86c941..b77794afcd 100644
--- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/WrapperGenerator.cpp
@@ -230,6 +230,7 @@ static NonnullOwnPtr<Interface> parse_interface(StringView filename, StringView
if (lexer.consume_specific("//")) {
lexer.consume_until('\n');
+ lexer.ignore();
consumed = true;
}
}
@@ -276,7 +277,9 @@ static NonnullOwnPtr<Interface> parse_interface(StringView filename, StringView
while (lexer.consume_specific("#import")) {
consume_whitespace();
assert_specific('<');
- imports.append(resolve_import(lexer.consume_until('>')));
+ auto path = lexer.consume_until('>');
+ lexer.ignore();
+ imports.append(resolve_import(path));
consume_whitespace();
}
diff --git a/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp b/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp
index 4e3a903990..2c506fbb36 100644
--- a/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp
+++ b/Meta/Lagom/Tools/CodeGenerators/StateMachineGenerator/main.cpp
@@ -88,10 +88,12 @@ parse_state_machine(StringView input)
num = 16 * num + get_hex_value(c);
} else {
lexer.consume_specific('\'');
- if (lexer.next_is('\\'))
+ if (lexer.next_is('\\')) {
num = (int)lexer.consume_escaped_character('\\');
- else
+ } else {
num = lexer.consume_until('\'').to_int().value();
+ lexer.ignore();
+ }
lexer.consume_specific('\'');
}
return num;
diff --git a/Userland/Libraries/LibC/scanf.cpp b/Userland/Libraries/LibC/scanf.cpp
index f760922de3..12e928a376 100644
--- a/Userland/Libraries/LibC/scanf.cpp
+++ b/Userland/Libraries/LibC/scanf.cpp
@@ -506,6 +506,7 @@ extern "C" int vsscanf(const char* input, const char* format, va_list ap)
case '[':
format_lexer.consume();
scanlist = format_lexer.consume_until(']');
+ format_lexer.ignore();
if (scanlist.starts_with('^')) {
scanlist = scanlist.substring_view(1);
invert_scanlist = true;
diff --git a/Userland/Libraries/LibCpp/Preprocessor.cpp b/Userland/Libraries/LibCpp/Preprocessor.cpp
index f1ade8f27b..5159f5ea6e 100644
--- a/Userland/Libraries/LibCpp/Preprocessor.cpp
+++ b/Userland/Libraries/LibCpp/Preprocessor.cpp
@@ -94,6 +94,7 @@ void Preprocessor::handle_preprocessor_statement(StringView line)
lexer.consume_specific('#');
consume_whitespace(lexer);
auto keyword = lexer.consume_until(' ');
+ lexer.ignore();
if (keyword.is_empty() || keyword.is_null() || keyword.is_whitespace())
return;
@@ -165,6 +166,7 @@ void Preprocessor::handle_preprocessor_keyword(StringView keyword, GenericLexer&
++m_current_depth;
if (m_state == State::Normal) {
auto key = line_lexer.consume_until(' ');
+ line_lexer.ignore();
if (m_definitions.contains(key)) {
m_depths_of_taken_branches.append(m_current_depth - 1);
return;
@@ -180,6 +182,7 @@ void Preprocessor::handle_preprocessor_keyword(StringView keyword, GenericLexer&
++m_current_depth;
if (m_state == State::Normal) {
auto key = line_lexer.consume_until(' ');
+ line_lexer.ignore();
if (!m_definitions.contains(key)) {
m_depths_of_taken_branches.append(m_current_depth - 1);
return;
@@ -353,10 +356,12 @@ Optional<Preprocessor::Definition> Preprocessor::create_definition(StringView li
String Preprocessor::remove_escaped_newlines(StringView value)
{
+ static constexpr auto escaped_newline = "\\\n"sv;
AK::StringBuilder processed_value;
GenericLexer lexer { value };
while (!lexer.is_eof()) {
- processed_value.append(lexer.consume_until("\\\n"sv));
+ processed_value.append(lexer.consume_until(escaped_newline));
+ lexer.ignore(escaped_newline.length());
}
return processed_value.to_string();
}
diff --git a/Userland/Utilities/lsof.cpp b/Userland/Utilities/lsof.cpp
index 2646173dac..ab6fd4f1c4 100644
--- a/Userland/Utilities/lsof.cpp
+++ b/Userland/Utilities/lsof.cpp
@@ -31,6 +31,7 @@ static bool parse_name(StringView name, OpenFile& file)
{
GenericLexer lexer(name);
auto component1 = lexer.consume_until(':');
+ lexer.ignore();
if (lexer.tell_remaining() == 0) {
file.name = component1;
@@ -50,6 +51,7 @@ static bool parse_name(StringView name, OpenFile& file)
}
auto component3 = lexer.consume_until(')');
+ lexer.ignore();
if (lexer.tell_remaining() != 0) {
dbgln("parse_name: expected EOF");
return false;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 20:12:58 +0000