From 890311d44d16ed7e22af30c3b5f22a73efb83bc0 Mon Sep 17 00:00:00 2001
From: Walter Bright <walter@walterbright.com>
Date: Fri, 17 Jan 2025 21:58:51 -0800
Subject: [PATCH] add with compound statement

---
 spec/statement.dd | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/spec/statement.dd b/spec/statement.dd
index ad268cbd07..3ebd1dc0ae 100644
--- a/spec/statement.dd
+++ b/spec/statement.dd
@@ -339,7 +339,6 @@ else
 //writeln(m.pre);      // Error: undefined identifier 'm'
 ---
 )
-    )
 
 $(H2 $(LEGACY_LNAME2 WhileStatement, while-statement, While Statement))
 
@@ -1762,12 +1761,18 @@ object.)
 
 $(GRAMMAR
 $(GNAME WithStatement):
-    $(D with) $(D $(LPAREN)) $(EXPRESSION) $(D $(RPAREN)) $(PSSCOPE)
-    $(D with) $(D $(LPAREN)) $(GLINK2 template, Symbol) $(D $(RPAREN)) $(PSSCOPE)
-    $(D with) $(D $(LPAREN)) $(GLINK2 template, TemplateInstance) $(D $(RPAREN)) $(PSSCOPE)
+    $(GLINK WithClause) $(PSSCOPE)
+    $(GLINK WithClause) : $(GLINK StatementList)
+
+    $(GNAME WithClause):
+        $(D with) $(D $(LPAREN)) $(EXPRESSION) $(D $(RPAREN))
+        $(D with) $(D $(LPAREN)) $(GLINK2 template, Symbol) $(D $(RPAREN))
+        $(D with) $(D $(LPAREN)) $(GLINK2 template, TemplateInstance) $(D $(RPAREN))
 )
 
-        where *Expression* evaluates to one of:
+    $(P The *StatementList* form is equivalent to the *ScopeStatement* form.)
+
+    $(P *Expression* evaluates to one of:)
 
         $(UL
         $(LI a class reference)
@@ -1776,8 +1781,8 @@ $(GNAME WithStatement):
         $(LI a pointer to one of the above)
         )
 
-        Within the with body the referenced object is searched first for
-        identifier symbols.
+        Within the `with` $(I ScopeStatement) or $(I StatementList) the referenced object is
+        searched first for identifier symbols.
 
 ---
 enum E { A, B }
@@ -1815,8 +1820,8 @@ with (expression)
 }(expression);
 --------------
 
-        $(P Note that *Expression* only gets evaluated once and is not copied.
-        The with statement does not change what $(D this) or
+        $(NOTE *Expression* only gets evaluated once and is not copied.
+        The *WithStatement* does not change what $(D this) or
         $(D super) refer to.
         )
 
@@ -1923,6 +1928,10 @@ void main()
                        // not implemented in `main`'s scope, so resolution is
                        // subsequently forward to module scope.
     }
+
+    with(foo):         // StatementList form
+        f();           // prints "Foo.f"
+        f();           // prints "Foo.f"
 }
 ---
 )