RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 10:28:10 +00:00
Code Issues Activity Actions

Everywhere: Add sv suffix to strings relying on StringView(char const*)

Browse source 
Each of these strings would previously rely on StringView's char const*
constructor overload, which would call __builtin_strlen on the string.
Since we now have operator ""sv, we can replace these with much simpler
versions. This opens the door to being able to remove
StringView(char const*).

No functional changes.
This commit is contained in:
sin-ack 2022-07-11 17:32:29 +00:00 • committed by Andreas Kling
parent e5f09ea170
commit 3f3f45580a
762 changed files with 8315 additions and 8316 deletions
Download patch file Download diff file Expand all files Collapse all files

108
Userland/Shell/Shell.cpp
View file

@ -98,7 +98,7 @@ String Shell::prompt() const
break;
switch (*ptr) {
case 'X':
builder.append("\033]0;");
builder.append("\033]0;"sv);
break;
case 'a':
builder.append(0x07);
@ -208,7 +208,7 @@ Vector<String> Shell::expand_globs(StringView path, StringView base)
{
auto explicitly_set_base = false;
if (path.starts_with('/')) {
base = "/";
base = "/"sv;
explicitly_set_base = true;
}
auto parts = split_path(path);
@ -367,7 +367,7 @@ RefPtr<AST::Value> Shell::get_argument(size_t index) const
return adopt_ref(*new AST::StringValue(current_script));
--index;
if (auto argv = lookup_local_variable("ARGV")) {
if (auto argv = lookup_local_variable("ARGV"sv)) {
if (argv->is_list_without_resolution()) {
AST::ListValue* list = static_cast<AST::ListValue*>(argv.ptr());
if (list->values().size() <= index)
@ -887,7 +887,7 @@ void Shell::execute_process(Vector<char const*>&& argv)
int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0) {
auto parts = StringView { argv[0] }.split_view('/');
auto parts = StringView { argv[0], strlen(argv[0]) }.split_view('/');
if (parts.size() == 1) {
// If this is a path in the current directory and it caused execvp() to fail,
// simply don't attempt to execute it, see #6774.
@ -913,10 +913,10 @@ void Shell::execute_process(Vector<char const*>&& argv)
break;
auto& file = file_result.value();
auto line = file->read_line();
if (!line.starts_with("#!"))
if (!line.starts_with("#!"sv))
break;
GenericLexer shebang_lexer { line.substring_view(2) };
auto shebang = shebang_lexer.consume_until(is_any_of("\n\r")).to_string();
auto shebang = shebang_lexer.consume_until(is_any_of("\n\r"sv)).to_string();
argv.prepend(shebang.characters());
int rc = execvp(argv[0], const_cast<char* const*>(argv.data()));
if (rc < 0) {
@ -1139,27 +1139,27 @@ String Shell::escape_token_for_single_quotes(StringView token)
// `foo bar \n '` -> `'foo bar \n '"'"`
StringBuilder builder;
builder.append("'");
builder.append("'"sv);
auto started_single_quote = true;
for (auto c : token) {
switch (c) {
case '\'':
builder.append("\"'\"");
builder.append("\"'\""sv);
started_single_quote = false;
continue;
default:
builder.append(c);
if (!started_single_quote) {
started_single_quote = true;
builder.append("'");
builder.append("'"sv);
}
break;
}
}
if (started_single_quote)
builder.append("'");
builder.append("'"sv);
return builder.build();
}
@ -1174,10 +1174,10 @@ String Shell::escape_token_for_double_quotes(StringView token)
for (auto c : token) {
switch (c) {
case '\"':
builder.append("\\\"");
builder.append("\\\""sv);
continue;
case '\\':
builder.append("\\\\");
builder.append("\\\\"sv);
continue;
default:
builder.append(c);
@ -1244,40 +1244,40 @@ static String do_escape(Shell::EscapeMode escape_mode, auto& token)
break;
case Shell::SpecialCharacterEscapeMode::Escaped:
if (escape_mode == Shell::EscapeMode::SingleQuotedString)
builder.append("'");
builder.append("'"sv);
builder.append('\\');
builder.append(c);
if (escape_mode == Shell::EscapeMode::SingleQuotedString)
builder.append("'");
builder.append("'"sv);
break;
case Shell::SpecialCharacterEscapeMode::QuotedAsEscape:
if (escape_mode == Shell::EscapeMode::SingleQuotedString)
builder.append("'");
builder.append("'"sv);
if (escape_mode != Shell::EscapeMode::DoubleQuotedString)
builder.append("\"");
builder.append("\""sv);
switch (c) {
case '\n':
builder.append(R"(\n)");
builder.append(R"(\n)"sv);
break;
case '\t':
builder.append(R"(\t)");
builder.append(R"(\t)"sv);
break;
case '\r':
builder.append(R"(\r)");
builder.append(R"(\r)"sv);
break;
default:
VERIFY_NOT_REACHED();
}
if (escape_mode != Shell::EscapeMode::DoubleQuotedString)
builder.append("\"");
builder.append("\""sv);
if (escape_mode == Shell::EscapeMode::SingleQuotedString)
builder.append("'");
builder.append("'"sv);
break;
case Shell::SpecialCharacterEscapeMode::QuotedAsHex:
if (escape_mode == Shell::EscapeMode::SingleQuotedString)
builder.append("'");
builder.append("'"sv);
if (escape_mode != Shell::EscapeMode::DoubleQuotedString)
builder.append("\"");
builder.append("\""sv);
if (c <= NumericLimits<u8>::max())
builder.appendff(R"(\x{:0>2x})", static_cast<u8>(c));
@ -1285,9 +1285,9 @@ static String do_escape(Shell::EscapeMode escape_mode, auto& token)
builder.appendff(R"(\u{:0>8x})", static_cast<u32>(c));
if (escape_mode != Shell::EscapeMode::DoubleQuotedString)
builder.append("\"");
builder.append("\""sv);
if (escape_mode == Shell::EscapeMode::SingleQuotedString)
builder.append("'");
builder.append("'"sv);
break;
}
}
@ -1460,7 +1460,7 @@ Vector<Line::CompletionSuggestion> Shell::complete(StringView line)
Vector<Line::CompletionSuggestion> Shell::complete_path(StringView base, StringView part, size_t offset, ExecutableOnly executable_only, AST::Node const* command_node, AST::Node const* node, EscapeMode escape_mode)
{
auto token = offset ? part.substring_view(0, offset) : "";
auto token = offset ? part.substring_view(0, offset) : ""sv;
String path;
ssize_t last_slash = token.length() - 1;
@ -1526,11 +1526,11 @@ Vector<Line::CompletionSuggestion> Shell::complete_path(StringView base, StringV
int stat_error = stat(file_path.characters(), &program_status);
if (!stat_error && (executable_only == ExecutableOnly::No || access(file_path.characters(), X_OK) == 0)) {
if (S_ISDIR(program_status.st_mode)) {
suggestions.append({ escape_token(file, escape_mode), "/" });
suggestions.append({ escape_token(file, escape_mode), "/"sv });
} else {
if (!allow_direct_children && !file.contains("/"))
if (!allow_direct_children && !file.contains('/'))
continue;
suggestions.append({ escape_token(file, escape_mode), " " });
suggestions.append({ escape_token(file, escape_mode), " "sv });
}
suggestions.last().input_offset = token_length;
suggestions.last().invariant_offset = invariant_offset;
@ -1556,7 +1556,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_program_name(StringView name,
});
if (!match)
return complete_path("", name, offset, ExecutableOnly::Yes, nullptr, nullptr, escape_mode);
return complete_path(""sv, name, offset, ExecutableOnly::Yes, nullptr, nullptr, escape_mode);
String completion = match->path;
auto token_length = escape_token(name, escape_mode).length();
@ -1573,10 +1573,10 @@ Vector<Line::CompletionSuggestion> Shell::complete_program_name(StringView name,
int index = match - cached_path.data();
for (int i = index - 1; i >= 0 && cached_path[i].path.starts_with(name); --i)
suggestions.append({ cached_path[i].path, " " });
suggestions.append({ cached_path[i].path, " "sv });
for (size_t i = index + 1; i < cached_path.size() && cached_path[i].path.starts_with(name); ++i)
suggestions.append({ cached_path[i].path, " " });
suggestions.append({ cached_path[index].path, " " });
suggestions.append({ cached_path[i].path, " "sv });
suggestions.append({ cached_path[index].path, " "sv });
for (auto& entry : suggestions) {
entry.input_offset = token_length;
@ -1590,7 +1590,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_program_name(StringView name,
Vector<Line::CompletionSuggestion> Shell::complete_variable(StringView name, size_t offset)
{
Vector<Line::CompletionSuggestion> suggestions;
auto pattern = offset ? name.substring_view(0, offset) : "";
auto pattern = offset ? name.substring_view(0, offset) : ""sv;
auto invariant_offset = offset;
size_t static_offset = 0;
@ -1631,7 +1631,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_variable(StringView name, siz
Vector<Line::CompletionSuggestion> Shell::complete_user(StringView name, size_t offset)
{
Vector<Line::CompletionSuggestion> suggestions;
auto pattern = offset ? name.substring_view(0, offset) : "";
auto pattern = offset ? name.substring_view(0, offset) : ""sv;
auto invariant_offset = offset;
size_t static_offset = 0;
@ -1668,7 +1668,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_option(StringView program_nam
size_t start = 0;
while (start < option.length() && option[start] == '-' && start < 2)
++start;
auto option_pattern = offset > start ? option.substring_view(start, offset - start) : "";
auto option_pattern = offset > start ? option.substring_view(start, offset - start) : ""sv;
auto invariant_offset = offset;
size_t static_offset = 0;
if (m_editor)
@ -1762,7 +1762,7 @@ ErrorOr<Vector<Line::CompletionSuggestion>> Shell::complete_via_program_itself(s
AST::NodeVisitor::visit(node);
auto list = pop_list();
StringBuilder builder;
builder.join("", list);
builder.join(""sv, list);
this->list().append(builder.build());
}
@ -1781,7 +1781,7 @@ ErrorOr<Vector<Line::CompletionSuggestion>> Shell::complete_via_program_itself(s
AST::NodeVisitor::visit(node);
auto list = pop_list();
StringBuilder builder;
builder.join("", list);
builder.join(""sv, list);
this->list().append(builder.build());
}
@ -1898,32 +1898,32 @@ ErrorOr<Vector<Line::CompletionSuggestion>> Shell::complete_via_program_itself(s
auto parsed = parsed_result.release_value();
if (parsed.is_object()) {
auto& object = parsed.as_object();
auto kind = object.get("kind").as_string_or("plain");
auto kind = object.get("kind"sv).as_string_or("plain");
if (kind == "path") {
auto base = object.get("base").as_string_or("");
auto part = object.get("part").as_string_or("");
auto executable_only = object.get("executable_only").to_bool(false) ? ExecutableOnly::Yes : ExecutableOnly::No;
auto base = object.get("base"sv).as_string_or("");
auto part = object.get("part"sv).as_string_or("");
auto executable_only = object.get("executable_only"sv).to_bool(false) ? ExecutableOnly::Yes : ExecutableOnly::No;
suggestions.extend(complete_path(base, part, part.length(), executable_only, nullptr, nullptr));
} else if (kind == "program") {
auto name = object.get("name").as_string_or("");
auto name = object.get("name"sv).as_string_or("");
suggestions.extend(complete_program_name(name, name.length()));
} else if (kind == "proxy") {
if (m_completion_stack_info.size_free() < 4 * KiB) {
dbgln("Not enough stack space, recursion?");
return IterationDecision::Continue;
}
auto argv = object.get("argv").as_string_or("");
auto argv = object.get("argv"sv).as_string_or("");
dbgln("Proxy completion for {}", argv);
suggestions.extend(complete(argv));
} else if (kind == "plain") {
Line::CompletionSuggestion suggestion {
object.get("completion").as_string_or(""),
object.get("trailing_trivia").as_string_or(""),
object.get("display_trivia").as_string_or(""),
object.get("completion"sv).as_string_or(""),
object.get("trailing_trivia"sv).as_string_or(""),
object.get("display_trivia"sv).as_string_or(""),
};
suggestion.static_offset = object.get("static_offset").to_u64(0);
suggestion.invariant_offset = object.get("invariant_offset").to_u64(0);
suggestion.allow_commit_without_listing = object.get("allow_commit_without_listing").to_bool(true);
suggestion.static_offset = object.get("static_offset"sv).to_u64(0);
suggestion.invariant_offset = object.get("invariant_offset"sv).to_u64(0);
suggestion.allow_commit_without_listing = object.get("allow_commit_without_listing"sv).to_bool(true);
suggestions.append(move(suggestion));
} else {
dbgln("LibLine: Unhandled completion kind: {}", kind);
@ -1957,7 +1957,7 @@ Vector<Line::CompletionSuggestion> Shell::complete_immediate_function_name(Strin
#define __ENUMERATE_SHELL_IMMEDIATE_FUNCTION(fn_name) \
if (auto name_view = #fn_name##sv; name_view.starts_with(name)) \
suggestions.append({ name_view, " " });
suggestions.append({ name_view, " "sv });
ENUMERATE_SHELL_IMMEDIATE_FUNCTIONS();
@ -2040,7 +2040,7 @@ bool Shell::read_single_line()
if (is_eof || is_empty) {
// Pretend the user tried to execute builtin_exit()
auto exit_code = run_command("exit");
auto exit_code = run_command("exit"sv);
if (exit_code != 0) {
// If we didn't end up actually calling exit(), and the command didn't succeed, just pretend it's all okay
// unless we can't, then just quit anyway.
@ -2188,8 +2188,8 @@ Shell::Shell()
if (path_env_ptr != NULL)
path.append({ path_env_ptr, strlen(path_env_ptr) });
if (path.length())
path.append(":");
path.append("/usr/local/sbin:/usr/local/bin:/usr/bin:/bin");
path.append(":"sv);
path.append("/usr/local/sbin:/usr/local/bin:/usr/bin:/bin"sv);
setenv("PATH", path.to_string().characters(), true);
}