RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 15:57:36 +00:00
Code Issues Activity Actions

LibWeb+LibIDL: Fix (or paper over) various const-correctness issues

Browse source 
There's definitely stuff to iterate on here, but this takes care of
making the libraries compile with stricter RP and NNRP.
This commit is contained in:
Andreas Kling 2023-02-20 18:56:08 +01:00
parent 68b5df6bf1
commit f11899f885
22 changed files with 210 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibIDL/IDLParser.cpp
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2020-2023, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021-2022, Linus Groh <linusg@serenityos.org>
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
* Copyright (c) 2022, Ali Mohammad Pur <mpfard@serenityos.org>
@ -163,10 +163,10 @@ Optional<Interface&> Parser::resolve_import(auto path)
return result;
}
NonnullRefPtr<Type> Parser::parse_type()
NonnullRefPtr<Type const> Parser::parse_type()
{
if (lexer.consume_specific('(')) {
NonnullRefPtrVector<Type> union_member_types;
NonnullRefPtrVector<Type const> union_member_types;
union_member_types.append(parse_type());
consume_whitespace();
assert_string("or"sv);
@ -203,7 +203,7 @@ NonnullRefPtr<Type> Parser::parse_type()
name = "long long"sv;
}
NonnullRefPtrVector<Type> parameters;
NonnullRefPtrVector<Type const> parameters;
bool is_parameterized_type = false;
if (lexer.consume_specific('<')) {
is_parameterized_type = true;
@ -820,11 +820,11 @@ void Parser::parse_non_interface_entities(bool allow_interface, Interface& inter
static void resolve_union_typedefs(Interface& interface, UnionType& union_);
static void resolve_typedef(Interface& interface, NonnullRefPtr<Type>& type, HashMap<DeprecatedString, DeprecatedString>* extended_attributes = {})
static void resolve_typedef(Interface& interface, NonnullRefPtr<Type const>& type, HashMap<DeprecatedString, DeprecatedString>* extended_attributes = {})
{
if (is<ParameterizedType>(*type)) {
auto& parameterized_type = type->as_parameterized();
auto& parameters = static_cast<Vector<NonnullRefPtr<Type>>&>(parameterized_type.parameters());
auto& parameterized_type = const_cast<Type&>(*type).as_parameterized();
auto& parameters = static_cast<Vector<NonnullRefPtr<Type const>>&>(parameterized_type.parameters());
for (auto& parameter : parameters)
resolve_typedef(interface, parameter);
return;
@ -832,7 +832,7 @@ static void resolve_typedef(Interface& interface, NonnullRefPtr<Type>& type, Has
// Resolve anonymous union types until we get named types that can be resolved in the next step.
if (is<UnionType>(*type) && type->name().is_empty()) {
resolve_union_typedefs(interface, type->as_union());
resolve_union_typedefs(interface, const_cast<Type&>(*type).as_union());
return;
}
@ -841,7 +841,7 @@ static void resolve_typedef(Interface& interface, NonnullRefPtr<Type>& type, Has
return;
bool nullable = type->is_nullable();
type = it->value.type;
type->set_nullable(nullable);
const_cast<Type&>(*type).set_nullable(nullable);
if (extended_attributes) {
for (auto& attribute : it->value.extended_attributes)
extended_attributes->set(attribute.key, attribute.value);
@ -859,12 +859,12 @@ static void resolve_typedef(Interface& interface, NonnullRefPtr<Type>& type, Has
// UnionType(UnionType(A, B), UnionType(C, D))
// Note that flattening unions is handled separately as per the spec.
if (is<UnionType>(*type))
resolve_union_typedefs(interface, type->as_union());
resolve_union_typedefs(interface, const_cast<Type&>(*type).as_union());
}
static void resolve_union_typedefs(Interface& interface, UnionType& union_)
{
auto& member_types = static_cast<Vector<NonnullRefPtr<Type>>&>(union_.member_types());
auto& member_types = static_cast<Vector<NonnullRefPtr<Type const>>&>(union_.member_types());
for (auto& member_type : member_types)
resolve_typedef(interface, member_type);
}

4
Userland/Libraries/LibIDL/IDLParser.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2020-2023, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Linus Groh <linusg@serenityos.org>
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
* Copyright (c) 2022, Ali Mohammad Pur <mpfard@serenityos.org>
@ -54,7 +54,7 @@ private:
void parse_iterable(Interface&);
Function parse_function(HashMap<DeprecatedString, DeprecatedString>& extended_attributes, Interface&, IsSpecialOperation is_special_operation = IsSpecialOperation::No);
Vector<Parameter> parse_parameters();
NonnullRefPtr<Type> parse_type();
NonnullRefPtr<Type const> parse_type();
void parse_constant(Interface&);
DeprecatedString import_base_path;

42
Userland/Libraries/LibIDL/Types.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2020-2023, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Linus Groh <linusg@serenityos.org>
* Copyright (c) 2021, Luke Wilde <lukew@serenityos.org>
* Copyright (c) 2022, Ali Mohammad Pur <mpfard@serenityos.org>
@ -143,7 +143,7 @@ private:
};
struct Parameter {
NonnullRefPtr<Type> type;
NonnullRefPtr<Type const> type;
DeprecatedString name;
bool optional { false };
Optional<DeprecatedString> optional_default_value;
@ -152,7 +152,7 @@ struct Parameter {
};
struct Function {
NonnullRefPtr<Type> return_type;
NonnullRefPtr<Type const> return_type;
DeprecatedString name;
Vector<Parameter> parameters;
HashMap<DeprecatedString, DeprecatedString> extended_attributes;
@ -170,7 +170,7 @@ struct Constructor {
};
struct Constant {
NonnullRefPtr<Type> type;
NonnullRefPtr<Type const> type;
DeprecatedString name;
DeprecatedString value;
};
@ -178,7 +178,7 @@ struct Constant {
struct Attribute {
bool inherit { false };
bool readonly { false };
NonnullRefPtr<Type> type;
NonnullRefPtr<Type const> type;
DeprecatedString name;
HashMap<DeprecatedString, DeprecatedString> extended_attributes;
@ -189,7 +189,7 @@ struct Attribute {
struct DictionaryMember {
bool required { false };
NonnullRefPtr<Type> type;
NonnullRefPtr<Type const> type;
DeprecatedString name;
HashMap<DeprecatedString, DeprecatedString> extended_attributes;
Optional<DeprecatedString> default_value;
@ -202,7 +202,7 @@ struct Dictionary {
struct Typedef {
HashMap<DeprecatedString, DeprecatedString> extended_attributes;
NonnullRefPtr<Type> type;
NonnullRefPtr<Type const> type;
};
struct Enumeration {
@ -213,7 +213,7 @@ struct Enumeration {
};
struct CallbackFunction {
NonnullRefPtr<Type> return_type;
NonnullRefPtr<Type const> return_type;
Vector<Parameter> parameters;
bool is_legacy_treat_non_object_as_null { false };
};
@ -222,7 +222,7 @@ class Interface;
class ParameterizedType : public Type {
public:
ParameterizedType(DeprecatedString name, bool nullable, NonnullRefPtrVector<Type> parameters)
ParameterizedType(DeprecatedString name, bool nullable, NonnullRefPtrVector<Type const> parameters)
: Type(Kind::Parameterized, move(name), nullable)
, m_parameters(move(parameters))
{
@ -232,11 +232,11 @@ public:
void generate_sequence_from_iterable(SourceGenerator& generator, DeprecatedString const& cpp_name, DeprecatedString const& iterable_cpp_name, DeprecatedString const& iterator_method_cpp_name, IDL::Interface const&, size_t recursion_depth) const;
NonnullRefPtrVector<Type> const& parameters() const { return m_parameters; }
NonnullRefPtrVector<Type>& parameters() { return m_parameters; }
NonnullRefPtrVector<Type const> const& parameters() const { return m_parameters; }
NonnullRefPtrVector<Type const>& parameters() { return m_parameters; }
private:
NonnullRefPtrVector<Type> m_parameters;
NonnullRefPtrVector<Type const> m_parameters;
};
static inline size_t get_shortest_function_length(Vector<Function&> const& overload_set)
@ -270,8 +270,8 @@ public:
Optional<DeprecatedString> stringifier_attribute;
bool has_unscopable_member { false };
Optional<NonnullRefPtr<Type>> value_iterator_type;
Optional<Tuple<NonnullRefPtr<Type>, NonnullRefPtr<Type>>> pair_iterator_types;
Optional<NonnullRefPtr<Type const>> value_iterator_type;
Optional<Tuple<NonnullRefPtr<Type const>, NonnullRefPtr<Type const>>> pair_iterator_types;
Optional<Function> named_property_getter;
Optional<Function> named_property_setter;
@ -318,7 +318,7 @@ public:
class UnionType : public Type {
public:
UnionType(DeprecatedString name, bool nullable, NonnullRefPtrVector<Type> member_types)
UnionType(DeprecatedString name, bool nullable, NonnullRefPtrVector<Type const> member_types)
: Type(Kind::Union, move(name), nullable)
, m_member_types(move(member_types))
{
@ -326,16 +326,16 @@ public:
virtual ~UnionType() override = default;
NonnullRefPtrVector<Type> const& member_types() const { return m_member_types; }
NonnullRefPtrVector<Type>& member_types() { return m_member_types; }
NonnullRefPtrVector<Type const> const& member_types() const { return m_member_types; }
NonnullRefPtrVector<Type const>& member_types() { return m_member_types; }
// https://webidl.spec.whatwg.org/#dfn-flattened-union-member-types
NonnullRefPtrVector<Type> flattened_member_types() const
NonnullRefPtrVector<Type const> flattened_member_types() const
{
// 1. Let T be the union type.
// 2. Initialize S to ∅.
NonnullRefPtrVector<Type> types;
NonnullRefPtrVector<Type const> types;
// 3. For each member type U of T:
for (auto& type : m_member_types) {
@ -390,7 +390,7 @@ public:
}
private:
NonnullRefPtrVector<Type> m_member_types;
NonnullRefPtrVector<Type const> m_member_types;
};
// https://webidl.spec.whatwg.org/#dfn-optionality-value
@ -405,7 +405,7 @@ class EffectiveOverloadSet {
public:
struct Item {
int callable_id;
NonnullRefPtrVector<Type> types;
NonnullRefPtrVector<Type const> types;
Vector<Optionality> optionality_values;
};