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

Everywhere: Rename {Deprecated => Byte}String

Browse source 
This commit un-deprecates DeprecatedString, and repurposes it as a byte
string.
As the null state has already been removed, there are no other
particularly hairy blockers in repurposing this type as a byte string
(what it _really_ is).

This commit is auto-generated:
  $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \
    Meta Ports Ladybird Tests Kernel)
  $ perl -pie 's/\bDeprecatedString\b/ByteString/g;
    s/deprecated_string/byte_string/g' $xs
  $ clang-format --style=file -i \
    $(git diff --name-only | grep \.cpp\|\.h)
  $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
Ali Mohammad Pur 2023-12-16 17:49:34 +03:30 • committed by Ali Mohammad Pur
parent 38d62563b3
commit 5e1499d104
1615 changed files with 10257 additions and 10257 deletions
Download patch file Download diff file Expand all files Collapse all files

78
Userland/Libraries/LibSQL/AST/Parser.cpp
View file

@ -91,7 +91,7 @@ NonnullRefPtr<CreateSchema> Parser::parse_create_schema_statement()
is_error_if_exists = false;
}
DeprecatedString schema_name = consume(TokenType::Identifier).value();
ByteString schema_name = consume(TokenType::Identifier).value();
return create_ast_node<CreateSchema>(move(schema_name), is_error_if_exists);
}
@ -112,8 +112,8 @@ NonnullRefPtr<CreateTable> Parser::parse_create_table_statement()
is_error_if_table_exists = false;
}
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
if (consume_if(TokenType::As)) {
@ -135,8 +135,8 @@ NonnullRefPtr<AlterTable> Parser::parse_alter_table_statement()
consume(TokenType::Alter);
consume(TokenType::Table);
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
if (consume_if(TokenType::Add)) {
@ -177,8 +177,8 @@ NonnullRefPtr<DropTable> Parser::parse_drop_table_statement()
is_error_if_table_does_not_exist = false;
}
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
return create_ast_node<DropTable>(move(schema_name), move(table_name), is_error_if_table_does_not_exist);
@ -201,15 +201,15 @@ NonnullRefPtr<Insert> Parser::parse_insert_statement(RefPtr<CommonTableExpressio
auto conflict_resolution = parse_conflict_resolution();
consume(TokenType::Into);
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
DeprecatedString alias;
ByteString alias;
if (consume_if(TokenType::As))
alias = consume(TokenType::Identifier).value();
Vector<DeprecatedString> column_names;
Vector<ByteString> column_names;
if (match(TokenType::ParenOpen))
parse_comma_separated_list(true, [&]() { column_names.append(consume(TokenType::Identifier).value()); });
@ -260,7 +260,7 @@ NonnullRefPtr<Update> Parser::parse_update_statement(RefPtr<CommonTableExpressio
Vector<Update::UpdateColumns> update_columns;
parse_comma_separated_list(false, [&]() {
Vector<DeprecatedString> column_names;
Vector<ByteString> column_names;
if (match(TokenType::ParenOpen)) {
parse_comma_separated_list(true, [&]() { column_names.append(consume(TokenType::Identifier).value()); });
} else {
@ -391,7 +391,7 @@ RefPtr<CommonTableExpressionList> Parser::parse_common_table_expression_list()
NonnullRefPtr<Expression> Parser::parse_expression()
{
if (++m_parser_state.m_current_expression_depth > Limits::maximum_expression_tree_depth) {
syntax_error(DeprecatedString::formatted("Exceeded maximum expression tree depth of {}", Limits::maximum_expression_tree_depth));
syntax_error(ByteString::formatted("Exceeded maximum expression tree depth of {}", Limits::maximum_expression_tree_depth));
return create_ast_node<ErrorExpression>();
}
@ -558,7 +558,7 @@ RefPtr<Expression> Parser::parse_bind_parameter_expression()
if (consume_if(TokenType::Placeholder)) {
auto parameter = m_parser_state.m_bound_parameters;
if (++m_parser_state.m_bound_parameters > Limits::maximum_bound_parameters)
syntax_error(DeprecatedString::formatted("Exceeded maximum number of bound parameters {}", Limits::maximum_bound_parameters));
syntax_error(ByteString::formatted("Exceeded maximum number of bound parameters {}", Limits::maximum_bound_parameters));
return create_ast_node<Placeholder>(parameter);
}
@ -566,23 +566,23 @@ RefPtr<Expression> Parser::parse_bind_parameter_expression()
return {};
}
RefPtr<Expression> Parser::parse_column_name_expression(Optional<DeprecatedString> with_parsed_identifier, bool with_parsed_period)
RefPtr<Expression> Parser::parse_column_name_expression(Optional<ByteString> with_parsed_identifier, bool with_parsed_period)
{
if (!with_parsed_identifier.has_value() && !match(TokenType::Identifier))
return {};
DeprecatedString first_identifier;
ByteString first_identifier;
if (!with_parsed_identifier.has_value())
first_identifier = consume(TokenType::Identifier).value();
else
first_identifier = with_parsed_identifier.release_value();
DeprecatedString schema_name;
DeprecatedString table_name;
DeprecatedString column_name;
ByteString schema_name;
ByteString table_name;
ByteString column_name;
if (with_parsed_period || consume_if(TokenType::Period)) {
DeprecatedString second_identifier = consume(TokenType::Identifier).value();
ByteString second_identifier = consume(TokenType::Identifier).value();
if (consume_if(TokenType::Period)) {
schema_name = move(first_identifier);
@ -762,7 +762,7 @@ RefPtr<Expression> Parser::parse_collate_expression(NonnullRefPtr<Expression> ex
return {};
consume();
DeprecatedString collation_name = consume(TokenType::Identifier).value();
ByteString collation_name = consume(TokenType::Identifier).value();
return create_ast_node<CollateExpression>(move(expression), move(collation_name));
}
@ -879,8 +879,8 @@ RefPtr<Expression> Parser::parse_in_expression(NonnullRefPtr<Expression> express
return create_ast_node<InChainedExpression>(move(expression), move(chain), invert_expression);
}
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
if (match(TokenType::ParenOpen)) {
@ -948,7 +948,7 @@ NonnullRefPtr<CommonTableExpression> Parser::parse_common_table_expression()
// https://sqlite.org/syntax/common-table-expression.html
auto table_name = consume(TokenType::Identifier).value();
Vector<DeprecatedString> column_names;
Vector<ByteString> column_names;
if (match(TokenType::ParenOpen))
parse_comma_separated_list(true, [&]() { column_names.append(consume(TokenType::Identifier).value()); });
@ -963,11 +963,11 @@ NonnullRefPtr<CommonTableExpression> Parser::parse_common_table_expression()
NonnullRefPtr<QualifiedTableName> Parser::parse_qualified_table_name()
{
// https://sqlite.org/syntax/qualified-table-name.html
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
DeprecatedString alias;
ByteString alias;
if (consume_if(TokenType::As))
alias = consume(TokenType::Identifier).value();
@ -991,7 +991,7 @@ NonnullRefPtr<ReturningClause> Parser::parse_returning_clause()
parse_comma_separated_list(false, [&]() {
auto expression = parse_expression();
DeprecatedString column_alias;
ByteString column_alias;
if (consume_if(TokenType::As) || match(TokenType::Identifier))
column_alias = consume(TokenType::Identifier).value();
@ -1010,7 +1010,7 @@ NonnullRefPtr<ResultColumn> Parser::parse_result_column()
// If we match an identifier now, we don't know whether it is a table-name of the form "table-name.*", or if it is the start of a
// column-name-expression, until we try to parse the asterisk. So if we consume an identifier and a period, but don't find an
// asterisk, hold onto that information to form a column-name-expression later.
Optional<DeprecatedString> table_name;
Optional<ByteString> table_name;
bool parsed_period = false;
if (match(TokenType::Identifier)) {
@ -1024,7 +1024,7 @@ NonnullRefPtr<ResultColumn> Parser::parse_result_column()
? parse_expression()
: static_cast<NonnullRefPtr<Expression>>(*parse_column_name_expression(move(table_name), parsed_period));
DeprecatedString column_alias;
ByteString column_alias;
if (consume_if(TokenType::As) || match(TokenType::Identifier))
column_alias = consume(TokenType::Identifier).value();
@ -1034,17 +1034,17 @@ NonnullRefPtr<ResultColumn> Parser::parse_result_column()
NonnullRefPtr<TableOrSubquery> Parser::parse_table_or_subquery()
{
if (++m_parser_state.m_current_subquery_depth > Limits::maximum_subquery_depth)
syntax_error(DeprecatedString::formatted("Exceeded maximum subquery depth of {}", Limits::maximum_subquery_depth));
syntax_error(ByteString::formatted("Exceeded maximum subquery depth of {}", Limits::maximum_subquery_depth));
ScopeGuard guard([&]() { --m_parser_state.m_current_subquery_depth; });
// https://sqlite.org/syntax/table-or-subquery.html
if (match(TokenType::Identifier)) {
DeprecatedString schema_name;
DeprecatedString table_name;
ByteString schema_name;
ByteString table_name;
parse_schema_and_table_name(schema_name, table_name);
DeprecatedString table_alias;
ByteString table_alias;
if (consume_if(TokenType::As) || match(TokenType::Identifier))
table_alias = consume(TokenType::Identifier).value();
@ -1064,7 +1064,7 @@ NonnullRefPtr<OrderingTerm> Parser::parse_ordering_term()
// https://sqlite.org/syntax/ordering-term.html
auto expression = parse_expression();
DeprecatedString collation_name;
ByteString collation_name;
if (is<CollateExpression>(*expression)) {
auto const& collate = static_cast<CollateExpression const&>(*expression);
collation_name = collate.collation_name();
@ -1089,9 +1089,9 @@ NonnullRefPtr<OrderingTerm> Parser::parse_ordering_term()
return create_ast_node<OrderingTerm>(move(expression), move(collation_name), order, nulls);
}
void Parser::parse_schema_and_table_name(DeprecatedString& schema_name, DeprecatedString& table_name)
void Parser::parse_schema_and_table_name(ByteString& schema_name, ByteString& table_name)
{
DeprecatedString schema_or_table_name = consume(TokenType::Identifier).value();
ByteString schema_or_table_name = consume(TokenType::Identifier).value();
if (consume_if(TokenType::Period)) {
schema_name = move(schema_or_table_name);
@ -1153,10 +1153,10 @@ bool Parser::match(TokenType type) const
void Parser::expected(StringView what)
{
syntax_error(DeprecatedString::formatted("Unexpected token {}, expected {}", m_parser_state.m_token.name(), what));
syntax_error(ByteString::formatted("Unexpected token {}, expected {}", m_parser_state.m_token.name(), what));
}
void Parser::syntax_error(DeprecatedString message)
void Parser::syntax_error(ByteString message)
{
m_parser_state.m_errors.append({ move(message), position() });
}