WIP fixup desugaring

Rust-GCC · Sep 21, 2024 · 95e61f1 · 95e61f1
1 parent 67028a9
commit 95e61f1
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 21 deletions.
diff --git a/gcc/rust/hir/rust-ast-lower-block.h b/gcc/rust/hir/rust-ast-lower-block.h
@@ -135,7 +135,7 @@ class ASTLoweringIfLetBlock : public ASTLoweringBase
 private:
   ASTLoweringIfLetBlock () : ASTLoweringBase (), translated (nullptr) {}
 
-  void desugar_iflet (AST::IfLetExpr &, HIR::Expr **,
+  void desugar_iflet (AST::IfLetExpr &, HIR::Expr **, HIR::Expr *,
 		      std::vector<HIR::MatchCase> &);
 
   HIR::MatchExpr *translated;

diff --git a/gcc/rust/hir/rust-ast-lower.cc b/gcc/rust/hir/rust-ast-lower.cc
@@ -215,6 +215,7 @@ ASTLoweringIfBlock::visit (AST::IfExprConseqElse &expr)
 void
 ASTLoweringIfLetBlock::desugar_iflet (AST::IfLetExpr &expr,
 				      HIR::Expr **branch_value,
+				      HIR::Expr *kase_else_expr,
 				      std::vector<HIR::MatchCase> &match_arms)
 {
   HIR::Expr *kase_expr;
@@ -245,6 +246,30 @@ ASTLoweringIfLetBlock::desugar_iflet (AST::IfLetExpr &expr,
   HIR::MatchCase kase (std::move (mapping), std::move (arm),
 		       std::unique_ptr<HIR::Expr> (kase_expr));
   match_arms.push_back (std::move (kase));
+
+  // The default match arm
+  std::vector<std::unique_ptr<HIR::Pattern>> match_arm_patterns_wildcard;
+  Analysis::NodeMapping mapping_default (crate_num, expr.get_node_id (),
+					 mappings.get_next_hir_id (crate_num),
+					 UNKNOWN_LOCAL_DEFID);
+
+  std::unique_ptr<HIR::WildcardPattern> wc
+    = std::unique_ptr<HIR::WildcardPattern> (
+      new HIR::WildcardPattern (mapping_default, expr.get_locus ()));
+
+  match_arm_patterns_wildcard.push_back (std::move (wc));
+
+  HIR::MatchArm arm_default (std::move (match_arm_patterns_wildcard),
+			     expr.get_locus (), nullptr, {});
+
+
+
+
+  HIR::MatchCase kase_else (std::move (mapping_default),
+			    std::move (arm_default),
+			    std::unique_ptr<HIR::Expr> (kase_else_expr));
+  match_arms.push_back (std::move (kase_else));
+
 }
 
 void
@@ -265,13 +290,24 @@ ASTLoweringIfLetBlock::visit (AST::IfLetExpr &expr)
   HIR::Expr *branch_value;
 
   std::vector<HIR::MatchCase> match_arms;
-  desugar_iflet (expr, &branch_value, match_arms);
-
   auto crate_num = mappings.get_current_crate ();
   Analysis::NodeMapping mapping (crate_num, expr.get_node_id (),
 				 mappings.get_next_hir_id (crate_num),
 				 UNKNOWN_LOCAL_DEFID);
 
+// new HIR::BlockExpr (mapping, std::move (block_stmts),
+// 			  std::unique_ptr<HIR::ExprWithoutBlock> (tail_expr),
+// 			  tail_reachable, expr.get_inner_attrs (),
+// 			  expr.get_outer_attrs (), label,
+// 			  expr.get_start_locus (), expr.get_end_locus ());
+
+  HIR::TupleExpr * unit = new HIR::TupleExpr(mapping, {}, {}, {}, expr.get_locus());
+  // HIR::BlockExpr empty_block = new HIR::BlockExpr (mapping, {}, nullptr,
+  // 						   false, {}, LoopLabel::error()/* label */
+  // 						   {}, expr.get_locus(), /* FIXME this is not OK */expr.get_locus());
+
+  desugar_iflet (expr, &branch_value, unit, match_arms);
+
   translated
     = new HIR::MatchExpr (mapping, std::unique_ptr<HIR::Expr> (branch_value),
 			  std::move (match_arms), {}, {}, expr.get_locus ());
@@ -297,34 +333,35 @@ ASTLoweringIfLetBlock::visit (AST::IfLetExprConseqElse &expr)
   HIR::Expr *branch_value;
   std::vector<HIR::MatchCase> match_arms;
 
-  desugar_iflet (expr, &branch_value, match_arms);
+  HIR::Expr *kase_else_expr
+    = ASTLoweringExpr::translate (expr.get_else_block ());
+
+  desugar_iflet (expr, &branch_value, kase_else_expr, match_arms);
 
   auto crate_num = mappings.get_current_crate ();
   Analysis::NodeMapping mapping (crate_num, expr.get_node_id (),
 				 mappings.get_next_hir_id (crate_num),
 				 UNKNOWN_LOCAL_DEFID);
 
-  std::vector<std::unique_ptr<HIR::Pattern>> match_arm_patterns_wildcard;
-  Analysis::NodeMapping mapping_default (crate_num, expr.get_node_id (),
-					 mappings.get_next_hir_id (crate_num),
-					 UNKNOWN_LOCAL_DEFID);
+  // std::vector<std::unique_ptr<HIR::Pattern>> match_arm_patterns_wildcard;
+  // Analysis::NodeMapping mapping_default (crate_num, expr.get_node_id (),
+  // 					 mappings.get_next_hir_id (crate_num),
+  // 					 UNKNOWN_LOCAL_DEFID);
 
-  std::unique_ptr<HIR::WildcardPattern> wc
-    = std::unique_ptr<HIR::WildcardPattern> (
-      new HIR::WildcardPattern (mapping_default, expr.get_locus ()));
+  // std::unique_ptr<HIR::WildcardPattern> wc
+  //   = std::unique_ptr<HIR::WildcardPattern> (
+  //     new HIR::WildcardPattern (mapping_default, expr.get_locus ()));
 
-  match_arm_patterns_wildcard.push_back (std::move (wc));
+  // match_arm_patterns_wildcard.push_back (std::move (wc));
 
-  HIR::MatchArm arm_default (std::move (match_arm_patterns_wildcard),
-			     expr.get_locus (), nullptr, {});
+  // HIR::MatchArm arm_default (std::move (match_arm_patterns_wildcard),
+  // 			     expr.get_locus (), nullptr, {});
 
-  HIR::Expr *kase_else_expr
-    = ASTLoweringExpr::translate (expr.get_else_block ());
 
-  HIR::MatchCase kase_else (std::move (mapping_default),
-			    std::move (arm_default),
-			    std::unique_ptr<HIR::Expr> (kase_else_expr));
-  match_arms.push_back (std::move (kase_else));
+  // HIR::MatchCase kase_else (std::move (mapping_default),
+  // 			    std::move (arm_default),
+  // 			    std::unique_ptr<HIR::Expr> (kase_else_expr));
+  // match_arms.push_back (std::move (kase_else));
 
   translated
     = new HIR::MatchExpr (mapping, std::unique_ptr<HIR::Expr> (branch_value),

diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h
@@ -32,7 +32,7 @@ namespace HIR {
 // TODO: inline?
 class LoopLabel /*: public Node*/
 {
-  Lifetime label; // or type LIFETIME_OR_LABEL
+  Lifetime label; // of type LIFETIME_OR_LABEL
 
   location_t locus;