diff options
author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-03-22 16:17:42 +0100 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:28:41 +0100 |
commit | 19c93b8286d5ed170c871f99e4beef2e5cf03db4 (patch) | |
tree | bd08e196ab6eaf29a9ab598675ce09ca707ae77d /gcc | |
parent | 2e08b1d26b82ea19378e052ad30104d4af6b4bf1 (diff) | |
download | gcc-19c93b8286d5ed170c871f99e4beef2e5cf03db4.zip gcc-19c93b8286d5ed170c871f99e4beef2e5cf03db4.tar.gz gcc-19c93b8286d5ed170c871f99e4beef2e5cf03db4.tar.bz2 |
gccrs: ast: Add Tokenstream visitors for loop expressions
Add the implementation of tokenstream dump for multiple loop
expressions.
gcc/rust/ChangeLog:
* ast/rust-ast-tokenstream.cc (TokenStream::visit): Add
visitors.
(TokenStream::visit_loop_common): Merge common loop code.
* ast/rust-ast-tokenstream.h: Add function prototypes.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/rust/ast/rust-ast-tokenstream.cc | 73 | ||||
-rw-r--r-- | gcc/rust/ast/rust-ast-tokenstream.h | 3 |
2 files changed, 64 insertions, 12 deletions
diff --git a/gcc/rust/ast/rust-ast-tokenstream.cc b/gcc/rust/ast/rust-ast-tokenstream.cc index 18337ac..c93c24c 100644 --- a/gcc/rust/ast/rust-ast-tokenstream.cc +++ b/gcc/rust/ast/rust-ast-tokenstream.cc @@ -1179,28 +1179,77 @@ TokenStream::visit (RangeToInclExpr &expr) } void -TokenStream::visit (ReturnExpr &) -{} +TokenStream::visit (ReturnExpr &expr) +{ + tokens.push_back (Rust::Token::make (RETURN_TOK, expr.get_locus ())); + if (expr.has_returned_expr ()) + visit (expr.get_returned_expr ()); +} void -TokenStream::visit (UnsafeBlockExpr &) -{} +TokenStream::visit (UnsafeBlockExpr &expr) +{ + tokens.push_back (Rust::Token::make (UNSAFE, expr.get_locus ())); + visit (expr.get_block_expr ()); +} void -TokenStream::visit (LoopExpr &) -{} +TokenStream::visit (LoopLabel &label) +{ + visit (label.get_lifetime ()); + tokens.push_back (Rust::Token::make (COLON, label.get_locus ())); +} void -TokenStream::visit (WhileLoopExpr &) -{} +TokenStream::visit_loop_common (BaseLoopExpr &expr) +{ + if (expr.has_loop_label ()) + visit (expr.get_loop_label ()); +} void -TokenStream::visit (WhileLetLoopExpr &) -{} +TokenStream::visit (LoopExpr &expr) +{ + visit_loop_common (expr); + tokens.push_back (Rust::Token::make (LOOP, expr.get_locus ())); + visit (expr.get_loop_block ()); +} void -TokenStream::visit (ForLoopExpr &) -{} +TokenStream::visit (WhileLoopExpr &expr) +{ + visit_loop_common (expr); + tokens.push_back (Rust::Token::make (WHILE, expr.get_locus ())); + visit (expr.get_predicate_expr ()); + visit (expr.get_loop_block ()); +} + +void +TokenStream::visit (WhileLetLoopExpr &expr) +{ + visit_loop_common (expr); + tokens.push_back (Rust::Token::make (WHILE, expr.get_locus ())); + tokens.push_back (Rust::Token::make (LET, Location ())); + // TODO: The reference mention only one Pattern + for (auto &item : expr.get_patterns ()) + { + visit (item); + } + tokens.push_back (Rust::Token::make (EQUAL, Location ())); + visit (expr.get_scrutinee_expr ()); + visit (expr.get_loop_block ()); +} + +void +TokenStream::visit (ForLoopExpr &expr) +{ + visit_loop_common (expr); + tokens.push_back (Rust::Token::make (FOR, expr.get_locus ())); + visit (expr.get_pattern ()); + tokens.push_back (Rust::Token::make (IN, Location ())); + visit (expr.get_iterator_expr ()); + visit (expr.get_loop_block ()); +} void TokenStream::visit (IfExpr &expr) diff --git a/gcc/rust/ast/rust-ast-tokenstream.h b/gcc/rust/ast/rust-ast-tokenstream.h index 58b90fb..c8a6982 100644 --- a/gcc/rust/ast/rust-ast-tokenstream.h +++ b/gcc/rust/ast/rust-ast-tokenstream.h @@ -94,6 +94,9 @@ private: void visit_function_common (std::unique_ptr<Type> &return_type, std::unique_ptr<BlockExpr> &block); + void visit_loop_common (BaseLoopExpr &expr); + void visit (LoopLabel &label); + void visit (Literal &lit, Location locus = {}); void visit (FunctionParam ¶m); |