From 36bca0cc1bbdb9da64a58cd1a7afaad30634e456 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Thu, 30 Mar 2023 20:05:14 +0200 Subject: gccrs: ast: Add outer attribute getter to Expr class We need to retrieve outer attributes from some Expressions depending on their context. This means this should be retrieved from their parent node. But expr did not have a getter for outer attributes since some expr can't have any outer attribute. gcc/rust/ChangeLog: * ast/rust-ast.h: Add getter to Expr class. * ast/rust-expr.h: Add override attribute to existing getters. Also implement it for RangeExpr, attempting to retrieve outer attributes on those types will crash the compiler. * ast/rust-macro.h: Add override attribute to existing getters. * ast/rust-path.h: Likewise. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/ast/rust-ast.h | 4 +++- gcc/rust/ast/rust-expr.h | 52 ++++++++++++++++++++++++++--------------------- gcc/rust/ast/rust-macro.h | 2 +- gcc/rust/ast/rust-path.h | 4 ++-- 4 files changed, 35 insertions(+), 27 deletions(-) (limited to 'gcc') diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h index 38473d9..5c76372 100644 --- a/gcc/rust/ast/rust-ast.h +++ b/gcc/rust/ast/rust-ast.h @@ -980,6 +980,8 @@ public: virtual void set_node_id (NodeId id) { node_id = id; } + virtual std::vector &get_outer_attrs () = 0; + protected: // Constructor Expr () : node_id (Analysis::Mappings::get ()->get_next_node_id ()) {} @@ -1064,7 +1066,7 @@ public: bool is_marked_for_strip () const override { return ident.empty (); } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { diff --git a/gcc/rust/ast/rust-expr.h b/gcc/rust/ast/rust-expr.h index ac32b98..bcf5ab3 100644 --- a/gcc/rust/ast/rust-expr.h +++ b/gcc/rust/ast/rust-expr.h @@ -78,7 +78,7 @@ public: bool is_marked_for_strip () const override { return literal.is_error (); } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -269,7 +269,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -865,7 +865,7 @@ public: std::vector &get_inner_attrs () { return inner_attrs; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1096,7 +1096,7 @@ public: std::vector &get_inner_attrs () { return inner_attrs; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1256,7 +1256,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1290,7 +1290,7 @@ public: std::vector &get_inner_attrs () { return inner_attrs; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1439,7 +1439,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1483,7 +1483,7 @@ public: bool is_marked_for_strip () const override { return struct_name.is_error (); } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1938,7 +1938,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2041,7 +2041,7 @@ public: PathExprSegment &get_method_name () { return method_name; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2126,7 +2126,7 @@ public: Identifier get_field_name () const { return field; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2254,7 +2254,7 @@ public: std::vector &get_params () { return params; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2449,7 +2449,7 @@ public: void strip_tail_expr () { expr = nullptr; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2594,7 +2594,7 @@ public: bool is_marked_for_strip () const override { return marked_for_strip; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2690,7 +2690,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -2725,6 +2725,12 @@ public: { rust_assert (false); } + + std::vector &get_outer_attrs () override + { + // RangeExpr cannot have any outer attributes + rust_assert (false); + } }; // Range from (inclusive) and to (exclusive) expression AST node object @@ -3180,7 +3186,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -3262,7 +3268,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -3381,7 +3387,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -3730,7 +3736,7 @@ public: // TODO: this mutable getter seems really dodgy. Think up better way. const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } protected: // Base clone function but still concrete as concrete base class @@ -3979,7 +3985,7 @@ public: // TODO: this mutable getter seems really dodgy. Think up better way. const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } protected: /* Use covariance to implement clone function as returning this object rather @@ -4455,7 +4461,7 @@ public: std::vector &get_inner_attrs () { return inner_attrs; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -4544,7 +4550,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -4626,7 +4632,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { diff --git a/gcc/rust/ast/rust-macro.h b/gcc/rust/ast/rust-macro.h index e6fcb81..7216db8 100644 --- a/gcc/rust/ast/rust-macro.h +++ b/gcc/rust/ast/rust-macro.h @@ -673,7 +673,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { diff --git a/gcc/rust/ast/rust-path.h b/gcc/rust/ast/rust-path.h index 0b9c280..8e4eb19 100644 --- a/gcc/rust/ast/rust-path.h +++ b/gcc/rust/ast/rust-path.h @@ -636,7 +636,7 @@ public: NodeId get_node_id () const override { return _node_id; } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { @@ -1233,7 +1233,7 @@ public: } const std::vector &get_outer_attrs () const { return outer_attrs; } - std::vector &get_outer_attrs () { return outer_attrs; } + std::vector &get_outer_attrs () override { return outer_attrs; } void set_outer_attrs (std::vector new_attrs) override { -- cgit v1.1