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>

diff --git a/gcc/rust/ast/rust-ast-tokenstream.cc b/gcc/rust/ast/rust-ast-tokenstream.cc
index 18337ac076c1b9a5d7aa85bbaaed5323cf20d988..c93c24c3fa83fd3e0a32c4077ddaa47486d9a6a1 100644 (file)
--- 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 58b90fba010b6d82f8841f81aab2b24b655fd400..c8a69829d900cfd9dfc3c9c5f6ce9ff801a1e7ef 100644 (file)
--- 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 &param);