Implement with(auto x = ...)

Author: thewilsonator

compiler/src/dmd/astbase.d

@@ -2321,6 +2321,7 @@ struct ASTBase
 
     extern (C++) final class WithStatement : Statement
     {
+        Parameter prm;
         Expression exp;
         Statement _body;
         Loc endloc;

compiler/src/dmd/frontend.h

@@ -5372,6 +5372,7 @@ class WhileStatement final : public Statement
 class WithStatement final : public Statement
 {
 public:
+    Parameter* prm;
     Expression* exp;
     Statement* _body;
     VarDeclaration* wthis;

compiler/src/dmd/parse.d

@@ -6661,7 +6661,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 exp = parseExpression();
                 closeCondition("with", null, exp);
                 _body = parseStatement(ParseStatementFlags.scope_, null, &endloc);
-                s = new AST.WithStatement(loc, exp, _body, endloc);
+                s = new AST.WithStatement(loc, null, exp, _body, endloc);
                 break;
             }
         case TOK.try_:

compiler/src/dmd/statement.d

@@ -1416,22 +1416,28 @@ extern (C++) final class SynchronizedStatement : Statement
  */
 extern (C++) final class WithStatement : Statement
 {
+    Parameter prm;
     Expression exp;
     Statement _body;
     VarDeclaration wthis;
     Loc endloc;
 
-    extern (D) this(Loc loc, Expression exp, Statement _body, Loc endloc) @safe
+    extern (D) this(Loc loc, Parameter prm, Expression exp, Statement _body, Loc endloc) @safe
     {
         super(loc, STMT.With);
+        this.prm = prm;
         this.exp = exp;
         this._body = _body;
         this.endloc = endloc;
     }
 
     override WithStatement syntaxCopy()
     {
-        return new WithStatement(loc, exp.syntaxCopy(), _body ? _body.syntaxCopy() : null, endloc);
+        return new WithStatement(loc,
+                                 prm ? prm.syntaxCopy() : null,
+                                 exp.syntaxCopy(),
+                                 _body ? _body.syntaxCopy() : null,
+                                 endloc);
     }
 
     override void accept(Visitor v)

compiler/src/dmd/statement.h

@@ -561,6 +561,7 @@ class SynchronizedStatement final : public Statement
 class WithStatement final : public Statement
 {
 public:
+    Parameter *prm;
     Expression *exp;
     Statement *_body;
     VarDeclaration *wthis;