diff options
Diffstat (limited to 'gcc/rust/ast/rust-expr.h')
| -rw-r--r-- | gcc/rust/ast/rust-expr.h | 109 |
1 files changed, 37 insertions, 72 deletions
diff --git a/gcc/rust/ast/rust-expr.h b/gcc/rust/ast/rust-expr.h index 4bb3557..88e45fe 100644 --- a/gcc/rust/ast/rust-expr.h +++ b/gcc/rust/ast/rust-expr.h @@ -65,8 +65,7 @@ public: return std::unique_ptr<LiteralExpr> (clone_literal_expr_impl ()); } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } Literal get_literal () const { return literal; } @@ -243,8 +242,7 @@ protected: OperatorExpr &operator= (OperatorExpr &&other) = default; public: - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } // Invalid if expr is null, so base stripping on that. void mark_for_strip () override { main_or_left_expr = nullptr; } @@ -895,8 +893,7 @@ public: GroupedExpr (GroupedExpr &&other) = default; GroupedExpr &operator= (GroupedExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1139,8 +1136,7 @@ public: ArrayExpr (ArrayExpr &&other) = default; ArrayExpr &operator= (ArrayExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1223,8 +1219,7 @@ public: ArrayIndexExpr (ArrayIndexExpr &&other) = default; ArrayIndexExpr &operator= (ArrayIndexExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1337,8 +1332,7 @@ public: /* Note: syntactically, can disambiguate single-element tuple from parens with * comma, i.e. (0,) rather than (0) */ - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1422,8 +1416,7 @@ public: TupleIndexExpr (TupleIndexExpr &&other) = default; TupleIndexExpr &operator= (TupleIndexExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1512,8 +1505,7 @@ public: inner_attrs (std::move (inner_attribs)), locus (locus) {} - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1600,7 +1592,7 @@ public: virtual void accept_vis (ASTVisitor &vis) = 0; - virtual Location get_locus_slow () const = 0; + virtual Location get_locus () const = 0; NodeId get_node_id () const { return node_id; } @@ -1628,8 +1620,7 @@ public: std::string as_string () const override { return field_name; } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1703,8 +1694,7 @@ public: std::string get_field_name () const { return field_name; } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } protected: /* Use covariance to implement clone function as returning this object rather @@ -1734,8 +1724,7 @@ public: TupleIndex get_index () const { return index; } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } protected: /* Use covariance to implement clone function as returning this object rather @@ -1913,8 +1902,7 @@ public: StructExprTuple (StructExprTuple &&other) = default; StructExprTuple &operator= (StructExprTuple &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -1950,8 +1938,7 @@ public: locus (locus) {} - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2022,7 +2009,7 @@ public: virtual void accept_vis (ASTVisitor &vis) = 0; - virtual Location get_locus_slow () const = 0; + virtual Location get_locus () const = 0; protected: // Clone function implementation as pure virtual method @@ -2044,8 +2031,7 @@ public: std::string as_string () const override { return field_name; } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } protected: /* Use covariance to implement clone function as returning this object rather @@ -2113,8 +2099,7 @@ public: void accept_vis (ASTVisitor &vis) override; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } protected: /* Use covariance to implement clone function as returning this object rather @@ -2144,8 +2129,7 @@ public: void accept_vis (ASTVisitor &vis) override; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } protected: /* Use covariance to implement clone function as returning this object rather @@ -2199,8 +2183,7 @@ public: EnumExprStruct (EnumExprStruct &&other) = default; EnumExprStruct &operator= (EnumExprStruct &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2263,8 +2246,7 @@ public: EnumExprTuple (EnumExprTuple &&other) = default; EnumExprTuple &operator= (EnumExprTuple &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2302,8 +2284,7 @@ public: locus (locus) {} - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2381,8 +2362,7 @@ public: // Returns whether function call has parameters. bool has_params () const { return !params.empty (); } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2491,8 +2471,7 @@ public: MethodCallExpr (MethodCallExpr &&other) = default; MethodCallExpr &operator= (MethodCallExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2594,8 +2573,7 @@ public: FieldAccessExpr (FieldAccessExpr &&other) = default; FieldAccessExpr &operator= (FieldAccessExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -2733,8 +2711,7 @@ protected: public: std::string as_string () const override; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } // TODO: this mutable getter seems really dodgy. Think up better way. const std::vector<ClosureParam> &get_params () const { return params; } @@ -2898,8 +2875,7 @@ public: return std::unique_ptr<BlockExpr> (clone_block_expr_impl ()); } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -3075,8 +3051,7 @@ public: locus (locus) {} - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -3165,8 +3140,7 @@ public: BreakExpr (BreakExpr &&other) = default; BreakExpr &operator= (BreakExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -3210,8 +3184,7 @@ protected: RangeExpr (Location locus) : locus (locus) {} public: - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } // should never be called - error if called void set_outer_attrs (std::vector<Attribute> /* new_attrs */) override @@ -3657,8 +3630,7 @@ public: ReturnExpr (ReturnExpr &&other) = default; ReturnExpr &operator= (ReturnExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -3740,8 +3712,7 @@ public: UnsafeBlockExpr (UnsafeBlockExpr &&other) = default; UnsafeBlockExpr &operator= (UnsafeBlockExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -3862,8 +3833,7 @@ public: LoopLabel &get_loop_label () { return loop_label; } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } // Invalid if loop block is null, so base stripping on that. void mark_for_strip () override { loop_block = nullptr; } @@ -4187,8 +4157,7 @@ public: * vector of else ifs - i.e. not like a switch statement. TODO - is this a * better approach? or does it not parse correctly and have downsides? */ - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -4430,8 +4399,7 @@ public: return std::unique_ptr<IfLetExpr> (clone_if_let_expr_impl ()); } - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -5049,8 +5017,7 @@ public: MatchExpr (MatchExpr &&other) = default; MatchExpr &operator= (MatchExpr &&other) = default; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -5136,8 +5103,7 @@ public: std::string as_string () const override; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; @@ -5218,8 +5184,7 @@ public: std::string as_string () const override; - Location get_locus () const { return locus; } - Location get_locus_slow () const final override { return get_locus (); } + Location get_locus () const override final { return locus; } void accept_vis (ASTVisitor &vis) override; |