diff options
Diffstat (limited to 'Userland/Libraries/LibSQL')
-rw-r--r-- | Userland/Libraries/LibSQL/AST/AST.h | 168 | ||||
-rw-r--r-- | Userland/Libraries/LibSQL/AST/Parser.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibSQL/AST/Parser.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibSQL/Meta.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibSQL/Tuple.cpp | 8 |
5 files changed, 92 insertions, 92 deletions
diff --git a/Userland/Libraries/LibSQL/AST/AST.h b/Userland/Libraries/LibSQL/AST/AST.h index cf58e78f13..d9e242e97c 100644 --- a/Userland/Libraries/LibSQL/AST/AST.h +++ b/Userland/Libraries/LibSQL/AST/AST.h @@ -62,8 +62,8 @@ public: VERIFY(m_signed_numbers.size() <= 2); } - const String& name() const { return m_name; } - const NonnullRefPtrVector<SignedNumber>& signed_numbers() const { return m_signed_numbers; } + String const& name() const { return m_name; } + NonnullRefPtrVector<SignedNumber> const& signed_numbers() const { return m_signed_numbers; } private: String m_name; @@ -78,8 +78,8 @@ public: { } - const String& name() const { return m_name; } - const NonnullRefPtr<TypeName>& type_name() const { return m_type_name; } + String const& name() const { return m_name; } + NonnullRefPtr<TypeName> const& type_name() const { return m_type_name; } private: String m_name; @@ -95,9 +95,9 @@ public: { } - const String& table_name() const { return m_table_name; } - const Vector<String>& column_names() const { return m_column_names; } - const NonnullRefPtr<Select>& select_statement() const { return m_select_statement; } + String const& table_name() const { return m_table_name; } + Vector<String> const& column_names() const { return m_column_names; } + NonnullRefPtr<Select> const& select_statement() const { return m_select_statement; } private: String m_table_name; @@ -115,7 +115,7 @@ public: } bool recursive() const { return m_recursive; } - const NonnullRefPtrVector<CommonTableExpression>& common_table_expressions() const { return m_common_table_expressions; } + NonnullRefPtrVector<CommonTableExpression> const& common_table_expressions() const { return m_common_table_expressions; } private: bool m_recursive; @@ -131,9 +131,9 @@ public: { } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } - const String& alias() const { return m_alias; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } + String const& alias() const { return m_alias; } private: String m_schema_name; @@ -156,7 +156,7 @@ public: } bool return_all_columns() const { return m_columns.is_empty(); }; - const Vector<ColumnClause>& columns() const { return m_columns; } + Vector<ColumnClause> const& columns() const { return m_columns; } private: Vector<ColumnClause> m_columns; @@ -188,11 +188,11 @@ public: ResultType type() const { return m_type; } bool select_from_table() const { return !m_table_name.is_null(); } - const String& table_name() const { return m_table_name; } + String const& table_name() const { return m_table_name; } bool select_from_expression() const { return !m_expression.is_null(); } - const RefPtr<Expression>& expression() const { return m_expression; } - const String& column_alias() const { return m_column_alias; } + RefPtr<Expression> const& expression() const { return m_expression; } + String const& column_alias() const { return m_column_alias; } private: ResultType m_type { ResultType::All }; @@ -212,8 +212,8 @@ public: VERIFY(!m_group_by_list.is_empty()); } - const NonnullRefPtrVector<Expression>& group_by_list() const { return m_group_by_list; } - const RefPtr<Expression>& having_clause() const { return m_having_clause; } + NonnullRefPtrVector<Expression> const& group_by_list() const { return m_group_by_list; } + RefPtr<Expression> const& having_clause() const { return m_having_clause; } private: NonnullRefPtrVector<Expression> m_group_by_list; @@ -239,12 +239,12 @@ public: } bool is_table() const { return m_is_table; } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } - const String& table_alias() const { return m_table_alias; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } + String const& table_alias() const { return m_table_alias; } bool is_subquery() const { return m_is_subquery; } - const NonnullRefPtrVector<TableOrSubquery>& subqueries() const { return m_subqueries; } + NonnullRefPtrVector<TableOrSubquery> const& subqueries() const { return m_subqueries; } private: bool m_is_table { false }; @@ -266,8 +266,8 @@ public: { } - const NonnullRefPtr<Expression>& expression() const { return m_expression; } - const String& collation_name() const { return m_collation_name; } + NonnullRefPtr<Expression> const& expression() const { return m_expression; } + String const& collation_name() const { return m_collation_name; } Order order() const { return m_order; } Nulls nulls() const { return m_nulls; } @@ -286,8 +286,8 @@ public: { } - const NonnullRefPtr<Expression>& limit_expression() const { return m_limit_expression; } - const RefPtr<Expression>& offset_expression() const { return m_offset_expression; } + NonnullRefPtr<Expression> const& limit_expression() const { return m_limit_expression; } + RefPtr<Expression> const& offset_expression() const { return m_offset_expression; } private: NonnullRefPtr<Expression> m_limit_expression; @@ -336,7 +336,7 @@ public: { } - const String& value() const { return m_value; } + String const& value() const { return m_value; } virtual ResultOr<Value> evaluate(ExecutionContext&) const override; private: @@ -350,7 +350,7 @@ public: { } - const String& value() const { return m_value; } + String const& value() const { return m_value; } private: String m_value; @@ -363,7 +363,7 @@ public: class NestedExpression : public Expression { public: - const NonnullRefPtr<Expression>& expression() const { return m_expression; } + NonnullRefPtr<Expression> const& expression() const { return m_expression; } virtual ResultOr<Value> evaluate(ExecutionContext&) const override; protected: @@ -378,8 +378,8 @@ private: class NestedDoubleExpression : public Expression { public: - const NonnullRefPtr<Expression>& lhs() const { return m_lhs; } - const NonnullRefPtr<Expression>& rhs() const { return m_rhs; } + NonnullRefPtr<Expression> const& lhs() const { return m_lhs; } + NonnullRefPtr<Expression> const& rhs() const { return m_rhs; } protected: NestedDoubleExpression(NonnullRefPtr<Expression> lhs, NonnullRefPtr<Expression> rhs) @@ -432,9 +432,9 @@ public: { } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } - const String& column_name() const { return m_column_name; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } + String const& column_name() const { return m_column_name; } virtual ResultOr<Value> evaluate(ExecutionContext&) const override; private: @@ -547,7 +547,7 @@ public: { } - const NonnullRefPtrVector<Expression>& expressions() const { return m_expressions; } + NonnullRefPtrVector<Expression> const& expressions() const { return m_expressions; } virtual ResultOr<Value> evaluate(ExecutionContext&) const override; private: @@ -562,7 +562,7 @@ public: { } - const NonnullRefPtr<TypeName>& type_name() const { return m_type_name; } + NonnullRefPtr<TypeName> const& type_name() const { return m_type_name; } private: NonnullRefPtr<TypeName> m_type_name; @@ -583,9 +583,9 @@ public: VERIFY(!m_when_then_clauses.is_empty()); } - const RefPtr<Expression>& case_expression() const { return m_case_expression; } - const Vector<WhenThenClause>& when_then_clauses() const { return m_when_then_clauses; } - const RefPtr<Expression>& else_expression() const { return m_else_expression; } + RefPtr<Expression> const& case_expression() const { return m_case_expression; } + Vector<WhenThenClause> const& when_then_clauses() const { return m_when_then_clauses; } + RefPtr<Expression> const& else_expression() const { return m_else_expression; } private: RefPtr<Expression> m_case_expression; @@ -601,7 +601,7 @@ public: { } - const NonnullRefPtr<Select>& select_statement() const { return m_select_statement; } + NonnullRefPtr<Select> const& select_statement() const { return m_select_statement; } bool invert_expression() const { return m_invert_expression; } private: @@ -617,7 +617,7 @@ public: { } - const String& collation_name() const { return m_collation_name; } + String const& collation_name() const { return m_collation_name; } private: String m_collation_name; @@ -640,7 +640,7 @@ public: } MatchOperator type() const { return m_type; } - const RefPtr<Expression>& escape() const { return m_escape; } + RefPtr<Expression> const& escape() const { return m_escape; } virtual ResultOr<Value> evaluate(ExecutionContext&) const override; private: @@ -672,7 +672,7 @@ public: { } - const NonnullRefPtr<Expression>& expression() const { return m_expression; } + NonnullRefPtr<Expression> const& expression() const { return m_expression; } private: NonnullRefPtr<Expression> m_expression; @@ -686,7 +686,7 @@ public: { } - const NonnullRefPtr<Select>& select_statement() const { return m_select_statement; } + NonnullRefPtr<Select> const& select_statement() const { return m_select_statement; } private: NonnullRefPtr<Select> m_select_statement; @@ -700,7 +700,7 @@ public: { } - const NonnullRefPtr<ChainedExpression>& expression_chain() const { return m_expression_chain; } + NonnullRefPtr<ChainedExpression> const& expression_chain() const { return m_expression_chain; } private: NonnullRefPtr<ChainedExpression> m_expression_chain; @@ -715,8 +715,8 @@ public: { } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } private: String m_schema_name; @@ -748,7 +748,7 @@ public: { } - const String& schema_name() const { return m_schema_name; } + String const& schema_name() const { return m_schema_name; } bool is_error_if_schema_exists() const { return m_is_error_if_schema_exists; } ResultOr<ResultSet> execute(ExecutionContext&) const override; @@ -778,14 +778,14 @@ public: { } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } bool has_selection() const { return !m_select_statement.is_null(); } - const RefPtr<Select>& select_statement() const { return m_select_statement; } + RefPtr<Select> const& select_statement() const { return m_select_statement; } bool has_columns() const { return !m_columns.is_empty(); } - const NonnullRefPtrVector<ColumnDefinition>& columns() const { return m_columns; } + NonnullRefPtrVector<ColumnDefinition> const& columns() const { return m_columns; } bool is_temporary() const { return m_is_temporary; } bool is_error_if_table_exists() const { return m_is_error_if_table_exists; } @@ -803,8 +803,8 @@ private: class AlterTable : public Statement { public: - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } protected: AlterTable(String schema_name, String table_name) @@ -826,7 +826,7 @@ public: { } - const String& new_table_name() const { return m_new_table_name; } + String const& new_table_name() const { return m_new_table_name; } private: String m_new_table_name; @@ -841,8 +841,8 @@ public: { } - const String& column_name() const { return m_column_name; } - const String& new_column_name() const { return m_new_column_name; } + String const& column_name() const { return m_column_name; } + String const& new_column_name() const { return m_new_column_name; } private: String m_column_name; @@ -857,7 +857,7 @@ public: { } - const NonnullRefPtr<ColumnDefinition>& column() const { return m_column; } + NonnullRefPtr<ColumnDefinition> const& column() const { return m_column; } private: NonnullRefPtr<ColumnDefinition> m_column; @@ -871,7 +871,7 @@ public: { } - const String& column_name() const { return m_column_name; } + String const& column_name() const { return m_column_name; } private: String m_column_name; @@ -886,8 +886,8 @@ public: { } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } bool is_error_if_table_does_not_exist() const { return m_is_error_if_table_does_not_exist; } private: @@ -938,20 +938,20 @@ public: { } - const RefPtr<CommonTableExpressionList>& common_table_expression_list() const { return m_common_table_expression_list; } + RefPtr<CommonTableExpressionList> const& common_table_expression_list() const { return m_common_table_expression_list; } ConflictResolution conflict_resolution() const { return m_conflict_resolution; } - const String& schema_name() const { return m_schema_name; } - const String& table_name() const { return m_table_name; } - const String& alias() const { return m_alias; } - const Vector<String>& column_names() const { return m_column_names; } + String const& schema_name() const { return m_schema_name; } + String const& table_name() const { return m_table_name; } + String const& alias() const { return m_alias; } + Vector<String> const& column_names() const { return m_column_names; } bool default_values() const { return !has_expressions() && !has_selection(); }; bool has_expressions() const { return !m_chained_expressions.is_empty(); } - const NonnullRefPtrVector<ChainedExpression>& chained_expressions() const { return m_chained_expressions; } + NonnullRefPtrVector<ChainedExpression> const& chained_expressions() const { return m_chained_expressions; } bool has_selection() const { return !m_select_statement.is_null(); } - const RefPtr<Select>& select_statement() const { return m_select_statement; } + RefPtr<Select> const& select_statement() const { return m_select_statement; } virtual ResultOr<ResultSet> execute(ExecutionContext&) const override; @@ -984,13 +984,13 @@ public: { } - const RefPtr<CommonTableExpressionList>& common_table_expression_list() const { return m_common_table_expression_list; } + RefPtr<CommonTableExpressionList> const& common_table_expression_list() const { return m_common_table_expression_list; } ConflictResolution conflict_resolution() const { return m_conflict_resolution; } - const NonnullRefPtr<QualifiedTableName>& qualified_table_name() const { return m_qualified_table_name; } - const Vector<UpdateColumns>& update_columns() const { return m_update_columns; } - const NonnullRefPtrVector<TableOrSubquery>& table_or_subquery_list() const { return m_table_or_subquery_list; } - const RefPtr<Expression>& where_clause() const { return m_where_clause; } - const RefPtr<ReturningClause>& returning_clause() const { return m_returning_clause; } + NonnullRefPtr<QualifiedTableName> const& qualified_table_name() const { return m_qualified_table_name; } + Vector<UpdateColumns> const& update_columns() const { return m_update_columns; } + NonnullRefPtrVector<TableOrSubquery> const& table_or_subquery_list() const { return m_table_or_subquery_list; } + RefPtr<Expression> const& where_clause() const { return m_where_clause; } + RefPtr<ReturningClause> const& returning_clause() const { return m_returning_clause; } private: RefPtr<CommonTableExpressionList> m_common_table_expression_list; @@ -1012,10 +1012,10 @@ public: { } - const RefPtr<CommonTableExpressionList>& common_table_expression_list() const { return m_common_table_expression_list; } - const NonnullRefPtr<QualifiedTableName>& qualified_table_name() const { return m_qualified_table_name; } - const RefPtr<Expression>& where_clause() const { return m_where_clause; } - const RefPtr<ReturningClause>& returning_clause() const { return m_returning_clause; } + RefPtr<CommonTableExpressionList> const& common_table_expression_list() const { return m_common_table_expression_list; } + NonnullRefPtr<QualifiedTableName> const& qualified_table_name() const { return m_qualified_table_name; } + RefPtr<Expression> const& where_clause() const { return m_where_clause; } + RefPtr<ReturningClause> const& returning_clause() const { return m_returning_clause; } private: RefPtr<CommonTableExpressionList> m_common_table_expression_list; @@ -1038,14 +1038,14 @@ public: { } - const RefPtr<CommonTableExpressionList>& common_table_expression_list() const { return m_common_table_expression_list; } + RefPtr<CommonTableExpressionList> const& common_table_expression_list() const { return m_common_table_expression_list; } bool select_all() const { return m_select_all; } - const NonnullRefPtrVector<ResultColumn>& result_column_list() const { return m_result_column_list; } - const NonnullRefPtrVector<TableOrSubquery>& table_or_subquery_list() const { return m_table_or_subquery_list; } - const RefPtr<Expression>& where_clause() const { return m_where_clause; } - const RefPtr<GroupByClause>& group_by_clause() const { return m_group_by_clause; } - const NonnullRefPtrVector<OrderingTerm>& ordering_term_list() const { return m_ordering_term_list; } - const RefPtr<LimitClause>& limit_clause() const { return m_limit_clause; } + NonnullRefPtrVector<ResultColumn> const& result_column_list() const { return m_result_column_list; } + NonnullRefPtrVector<TableOrSubquery> const& table_or_subquery_list() const { return m_table_or_subquery_list; } + RefPtr<Expression> const& where_clause() const { return m_where_clause; } + RefPtr<GroupByClause> const& group_by_clause() const { return m_group_by_clause; } + NonnullRefPtrVector<OrderingTerm> const& ordering_term_list() const { return m_ordering_term_list; } + RefPtr<LimitClause> const& limit_clause() const { return m_limit_clause; } ResultOr<ResultSet> execute(ExecutionContext&) const override; private: diff --git a/Userland/Libraries/LibSQL/AST/Parser.cpp b/Userland/Libraries/LibSQL/AST/Parser.cpp index b081183729..94ed6f55e3 100644 --- a/Userland/Libraries/LibSQL/AST/Parser.cpp +++ b/Userland/Libraries/LibSQL/AST/Parser.cpp @@ -809,7 +809,7 @@ RefPtr<Expression> Parser::parse_between_expression(NonnullRefPtr<Expression> ex return create_ast_node<ErrorExpression>(); } - const auto& binary_expression = static_cast<const BinaryOperatorExpression&>(*nested); + auto const& binary_expression = static_cast<BinaryOperatorExpression const&>(*nested); if (binary_expression.type() != BinaryOperator::And) { expected("AND Expression"); return create_ast_node<ErrorExpression>(); @@ -1030,7 +1030,7 @@ NonnullRefPtr<OrderingTerm> Parser::parse_ordering_term() String collation_name; if (is<CollateExpression>(*expression)) { - const auto& collate = static_cast<const CollateExpression&>(*expression); + auto const& collate = static_cast<CollateExpression const&>(*expression); collation_name = collate.collation_name(); expression = collate.expression(); } else if (consume_if(TokenType::Collate)) { diff --git a/Userland/Libraries/LibSQL/AST/Parser.h b/Userland/Libraries/LibSQL/AST/Parser.h index 6a4db5695d..9d35018d3f 100644 --- a/Userland/Libraries/LibSQL/AST/Parser.h +++ b/Userland/Libraries/LibSQL/AST/Parser.h @@ -38,7 +38,7 @@ public: NonnullRefPtr<Statement> next_statement(); bool has_errors() const { return m_parser_state.m_errors.size(); } - const Vector<Error>& errors() const { return m_parser_state.m_errors; } + Vector<Error> const& errors() const { return m_parser_state.m_errors; } protected: NonnullRefPtr<Expression> parse_expression(); // Protected for unit testing. diff --git a/Userland/Libraries/LibSQL/Meta.cpp b/Userland/Libraries/LibSQL/Meta.cpp index 5dab68e598..8202c9d9be 100644 --- a/Userland/Libraries/LibSQL/Meta.cpp +++ b/Userland/Libraries/LibSQL/Meta.cpp @@ -65,7 +65,7 @@ Key ColumnDef::key() const return key; } -void ColumnDef::set_default_value(const Value& default_value) +void ColumnDef::set_default_value(Value const& default_value) { VERIFY(default_value.type() == type()); m_default = default_value; diff --git a/Userland/Libraries/LibSQL/Tuple.cpp b/Userland/Libraries/LibSQL/Tuple.cpp index a25a057cbb..58a96fabe8 100644 --- a/Userland/Libraries/LibSQL/Tuple.cpp +++ b/Userland/Libraries/LibSQL/Tuple.cpp @@ -117,7 +117,7 @@ Value& Tuple::operator[](String const& name) return (*this)[index.value()]; } -void Tuple::append(const Value& value) +void Tuple::append(Value const& value) { VERIFY(descriptor()->size() >= size()); if (descriptor()->size() == size()) { @@ -198,7 +198,7 @@ Vector<String> Tuple::to_string_vector() const return ret; } -void Tuple::copy_from(const Tuple& other) +void Tuple::copy_from(Tuple const& other) { if (*m_descriptor != *other.m_descriptor) { m_descriptor->clear(); @@ -213,7 +213,7 @@ void Tuple::copy_from(const Tuple& other) m_pointer = other.pointer(); } -int Tuple::compare(const Tuple& other) const +int Tuple::compare(Tuple const& other) const { auto num_values = min(m_data.size(), other.m_data.size()); VERIFY(num_values > 0); @@ -228,7 +228,7 @@ int Tuple::compare(const Tuple& other) const return 0; } -int Tuple::match(const Tuple& other) const +int Tuple::match(Tuple const& other) const { auto other_index = 0u; for (auto& part : *other.descriptor()) { |