1 files changed, 206 insertions, 17 deletions

diff --git a/gcc/rust/ast/rust-ast-builder.cc b/gcc/rust/ast/rust-ast-builder.cc
index 47044df..86290e1 100644
--- a/gcc/rust/ast/rust-ast-builder.cc
+++ b/gcc/rust/ast/rust-ast-builder.cc
@@ -21,15 +21,26 @@
 #include "rust-ast.h"
 #include "rust-common.h"
 #include "rust-expr.h"
+#include "rust-keyword-values.h"
 #include "rust-path.h"
 #include "rust-item.h"
 #include "rust-path.h"
+#include "rust-pattern.h"
 #include "rust-system.h"
 #include "rust-token.h"
+#include <memory>
 
 namespace Rust {
 namespace AST {
 
+std::unique_ptr<Stmt>
+Builder::statementify (std::unique_ptr<Expr> &&value,
+		       bool semicolon_followed) const
+{
+  return std::make_unique<ExprStmt> (std::move (value), loc,
+				     semicolon_followed);
+}
+
 std::unique_ptr<Expr>
 Builder::literal_string (std::string &&content) const
 {
@@ -39,6 +50,17 @@ Builder::literal_string (std::string &&content) const
 }
 
 std::unique_ptr<Expr>
+Builder::literal_bool (bool b) const
+{
+  auto str
+    = b ? Values::Keywords::TRUE_LITERAL : Values::Keywords::FALSE_LITERAL;
+
+  return std::unique_ptr<Expr> (
+    new AST::LiteralExpr (std::move (str), Literal::LitType::BOOL,
+			  PrimitiveCoreType::CORETYPE_BOOL, {}, loc));
+}
+
+std::unique_ptr<Expr>
 Builder::call (std::unique_ptr<Expr> &&path,
 	       std::vector<std::unique_ptr<Expr>> &&args) const
 {
@@ -64,6 +86,27 @@ Builder::array (std::vector<std::unique_ptr<Expr>> &&members) const
 }
 
 std::unique_ptr<Expr>
+Builder::qualified_path_in_expression (std::unique_ptr<Type> &&type,
+				       TypePath trait,
+				       PathExprSegment segment) const
+{
+  auto segments = {segment};
+
+  return qualified_path_in_expression (std::move (type), trait, segments);
+}
+
+std::unique_ptr<Expr>
+Builder::qualified_path_in_expression (
+  std::unique_ptr<Type> &&type, TypePath trait,
+  std::vector<PathExprSegment> &&segments) const
+{
+  auto qual_type = QualifiedPathType (std::move (type), loc, trait);
+
+  return std::unique_ptr<QualifiedPathInExpression> (
+    new QualifiedPathInExpression (qual_type, std::move (segments), {}, loc));
+}
+
+std::unique_ptr<Expr>
 Builder::identifier (std::string name) const
 {
   return std::unique_ptr<Expr> (new IdentifierExpr (name, {}, loc));
@@ -83,12 +126,48 @@ Builder::tuple_idx (std::string receiver, int idx) const
     new TupleIndexExpr (identifier (receiver), idx, {}, loc));
 }
 
+std::unique_ptr<Expr>
+Builder::tuple (std::vector<std::unique_ptr<Expr>> &&values) const
+{
+  return std::unique_ptr<TupleExpr> (
+    new TupleExpr (std::move (values), {}, {}, loc));
+}
+
+std::unique_ptr<Param>
+Builder::self_ref_param (bool mutability) const
+{
+  return std::make_unique<SelfParam> (Lifetime::error (), mutability, loc);
+}
+
+std::unique_ptr<Param>
+Builder::function_param (std::unique_ptr<Pattern> &&pattern,
+			 std::unique_ptr<Type> &&type) const
+{
+  return std::unique_ptr<FunctionParam> (
+    new FunctionParam (std::move (pattern), std::move (type), {}, loc));
+}
+
 FunctionQualifiers
 Builder::fn_qualifiers () const
 {
   return FunctionQualifiers (loc, Async::No, Const::No, Unsafety::Normal);
 }
 
+std::unique_ptr<Function>
+Builder::function (std::string function_name,
+		   std::vector<std::unique_ptr<Param>> params,
+		   std::unique_ptr<Type> return_type,
+		   std::unique_ptr<BlockExpr> block,
+		   std::vector<std::unique_ptr<GenericParam>> generic_params,
+		   FunctionQualifiers qualifiers, WhereClause where_clause,
+		   Visibility visibility) const
+{
+  return std::unique_ptr<Function> (
+    new Function (function_name, qualifiers, std::move (generic_params),
+		  std::move (params), std::move (return_type), where_clause,
+		  std::move (block), visibility, {}, loc));
+}
+
 PathExprSegment
 Builder::path_segment (std::string seg) const
 {
@@ -159,12 +238,31 @@ Builder::single_generic_type_path (LangItem::Kind lang_item,
 }
 
 TypePath
+Builder::type_path (std::vector<std::unique_ptr<TypePathSegment>> &&segments,
+		    bool opening_scope) const
+{
+  return TypePath (std::move (segments), loc, opening_scope);
+}
+
+TypePath
+Builder::type_path (std::vector<std::string> &&segments,
+		    bool opening_scope) const
+{
+  auto type_segments = std::vector<std::unique_ptr<TypePathSegment>> ();
+
+  for (auto &&segment : segments)
+    type_segments.emplace_back (type_path_segment (segment));
+
+  return TypePath (std::move (type_segments), loc, opening_scope);
+}
+
+TypePath
 Builder::type_path (std::unique_ptr<TypePathSegment> &&segment) const
 {
   auto segments = std::vector<std::unique_ptr<TypePathSegment>> ();
   segments.emplace_back (std::move (segment));
 
-  return TypePath (std::move (segments), loc);
+  return type_path (std::move (segments));
 }
 
 TypePath
@@ -179,14 +277,23 @@ Builder::type_path (LangItem::Kind lang_item) const
   return type_path (type_path_segment (lang_item));
 }
 
+std::unique_ptr<Type>
+Builder::reference_type (std::unique_ptr<TypeNoBounds> &&inner_type,
+			 bool mutability) const
+{
+  return std::make_unique<ReferenceType> (mutability, std::move (inner_type),
+					  loc);
+}
+
 PathInExpression
-Builder::path_in_expression (std::vector<std::string> &&segments) const
+Builder::path_in_expression (std::vector<std::string> &&segments,
+			     bool opening_scope) const
 {
   auto path_segments = std::vector<PathExprSegment> ();
   for (auto &seg : segments)
     path_segments.emplace_back (path_segment (seg));
 
-  return PathInExpression (std::move (path_segments), {}, loc);
+  return PathInExpression (std::move (path_segments), {}, loc, opening_scope);
 }
 
 PathInExpression
@@ -195,28 +302,53 @@ Builder::path_in_expression (LangItem::Kind lang_item) const
   return PathInExpression (lang_item, {}, loc);
 }
 
-std::unique_ptr<Expr>
-Builder::block (std::unique_ptr<Stmt> &&stmt,
+PathInExpression
+Builder::variant_path (const std::string &enum_path,
+		       const std::string &variant) const
+{
+  return PathInExpression ({path_segment (enum_path), path_segment (variant)},
+			   {}, loc, false);
+}
+
+std::unique_ptr<BlockExpr>
+Builder::block (tl::optional<std::unique_ptr<Stmt>> &&stmt,
 		std::unique_ptr<Expr> &&tail_expr) const
 {
   auto stmts = std::vector<std::unique_ptr<Stmt>> ();
-  stmts.emplace_back (std::move (stmt));
+
+  if (stmt)
+    stmts.emplace_back (std::move (*stmt));
 
   return block (std::move (stmts), std::move (tail_expr));
 }
 
-std::unique_ptr<Expr>
+std::unique_ptr<BlockExpr>
+Builder::block () const
+{
+  auto stmts = std::vector<std::unique_ptr<Stmt>> ();
+
+  return block (std::move (stmts));
+}
+
+std::unique_ptr<BlockExpr>
 Builder::block (std::vector<std::unique_ptr<Stmt>> &&stmts,
 		std::unique_ptr<Expr> &&tail_expr) const
 {
-  return std::unique_ptr<Expr> (new BlockExpr (std::move (stmts),
-					       std::move (tail_expr), {}, {},
-					       LoopLabel::error (), loc, loc));
+  return std::unique_ptr<BlockExpr> (
+    new BlockExpr (std::move (stmts), std::move (tail_expr), {}, {},
+		   LoopLabel::error (), loc, loc));
+}
+
+std::unique_ptr<Expr>
+Builder::return_expr (std::unique_ptr<Expr> &&to_return)
+{
+  return std::unique_ptr<Expr> (
+    new ReturnExpr (std::move (to_return), {}, loc));
 }
 
 std::unique_ptr<Stmt>
-Builder::let (std::unique_ptr<Pattern> pattern, std::unique_ptr<Type> type,
-	      std::unique_ptr<Expr> init) const
+Builder::let (std::unique_ptr<Pattern> &&pattern, std::unique_ptr<Type> &&type,
+	      std::unique_ptr<Expr> &&init) const
 {
   return std::unique_ptr<Stmt> (new LetStmt (std::move (pattern),
 					     std::move (init), std::move (type),
@@ -238,6 +370,24 @@ Builder::deref (std::unique_ptr<Expr> &&of) const
   return std::unique_ptr<Expr> (new DereferenceExpr (std::move (of), {}, loc));
 }
 
+std::unique_ptr<Expr>
+Builder::comparison_expr (std::unique_ptr<Expr> &&lhs,
+			  std::unique_ptr<Expr> &&rhs,
+			  ComparisonOperator op) const
+{
+  return std::make_unique<ComparisonExpr> (std::move (lhs), std::move (rhs), op,
+					   loc);
+}
+
+std::unique_ptr<Expr>
+Builder::boolean_operation (std::unique_ptr<Expr> &&lhs,
+			    std::unique_ptr<Expr> &&rhs,
+			    LazyBooleanOperator op) const
+{
+  return std::make_unique<LazyBooleanExpr> (std::move (lhs), std::move (rhs),
+					    op, loc);
+}
+
 std::unique_ptr<Stmt>
 Builder::struct_struct (std::string struct_name,
 			std::vector<std::unique_ptr<GenericParam>> &&generics,
@@ -297,6 +447,13 @@ Builder::wildcard () const
   return std::unique_ptr<Pattern> (new WildcardPattern (loc));
 }
 
+std::unique_ptr<Pattern>
+Builder::ref_pattern (std::unique_ptr<Pattern> &&inner) const
+{
+  return std::make_unique<ReferencePattern> (std::move (inner), false, false,
+					     loc);
+}
+
 std::unique_ptr<Path>
 Builder::lang_item_path (LangItem::Kind kind) const
 {
@@ -330,11 +487,39 @@ Builder::match_case (std::unique_ptr<Pattern> &&pattern,
 std::unique_ptr<Expr>
 Builder::loop (std::vector<std::unique_ptr<Stmt>> &&stmts)
 {
-  auto block = std::unique_ptr<BlockExpr> (
-    new BlockExpr (std::move (stmts), nullptr, {}, {}, LoopLabel::error (), loc,
-		   loc));
+  auto block_expr = block (std::move (stmts), nullptr);
 
-  return std::unique_ptr<Expr> (new LoopExpr (std::move (block), loc));
+  return std::unique_ptr<Expr> (new LoopExpr (std::move (block_expr), loc));
+}
+
+std::unique_ptr<TypeParamBound>
+Builder::trait_bound (TypePath bound)
+{
+  return std::make_unique<TraitBound> (bound, loc);
+}
+
+std::unique_ptr<Item>
+Builder::trait_impl (TypePath trait_path, std::unique_ptr<Type> target,
+		     std::vector<std::unique_ptr<AssociatedItem>> trait_items,
+		     std::vector<std::unique_ptr<GenericParam>> generics,
+		     WhereClause where_clause, Visibility visibility) const
+{
+  return std::unique_ptr<Item> (
+    new TraitImpl (trait_path, /* unsafe */ false,
+		   /* exclam */ false, std::move (trait_items),
+		   std::move (generics), std::move (target), where_clause,
+		   visibility, {}, {}, loc));
+}
+
+std::unique_ptr<GenericParam>
+Builder::generic_type_param (
+  std::string type_representation,
+  std::vector<std::unique_ptr<TypeParamBound>> &&bounds,
+  std::unique_ptr<Type> &&type)
+{
+  return std::make_unique<TypeParam> (type_representation, loc,
+				      std::move (bounds), std::move (type),
+				      std::vector<Attribute> ());
 }
 
 std::unique_ptr<Type>
@@ -361,7 +546,8 @@ Builder::new_lifetime_param (LifetimeParam &param)
 }
 
 std::unique_ptr<GenericParam>
-Builder::new_type_param (TypeParam &param)
+Builder::new_type_param (
+  TypeParam &param, std::vector<std::unique_ptr<TypeParamBound>> extra_bounds)
 {
   location_t locus = param.get_locus ();
   AST::AttrVec outer_attrs = param.get_outer_attrs ();
@@ -372,6 +558,9 @@ Builder::new_type_param (TypeParam &param)
   if (param.has_type ())
     type = new_type (param.get_type ());
 
+  for (auto &&extra_bound : extra_bounds)
+    type_param_bounds.emplace_back (std::move (extra_bound));
+
   for (const auto &b : param.get_type_param_bounds ())
     {
       switch (b->get_bound_type ())