From 96932694b295251633ac9e5d0e3a8e9321e8d4f6 Mon Sep 17 00:00:00 2001
From: Robert Widmann <devteam.codafi@gmail.com>
Date: Tue, 30 Aug 2022 10:41:32 -0700
Subject: [PATCH] Split Statement Grammar and Item Grammar Apart

TSPL has referred to declarations and expressions as "statements", while
the Swift Compiler refers to this general class of syntax
as "items". Split the statement and item productions apart.
---
 .../TSPL.docc/ReferenceManual/Declarations.md | 19 ++++++++++++++-----
 .../TSPL.docc/ReferenceManual/Expressions.md  |  2 +-
 .../TSPL.docc/ReferenceManual/Statements.md   |  8 +++-----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Sources/TSPL/TSPL.docc/ReferenceManual/Declarations.md b/Sources/TSPL/TSPL.docc/ReferenceManual/Declarations.md
index f8c2e8864..a552e4ee0 100644
--- a/Sources/TSPL/TSPL.docc/ReferenceManual/Declarations.md
+++ b/Sources/TSPL/TSPL.docc/ReferenceManual/Declarations.md
@@ -70,27 +70,36 @@ or a file that contains top-level executable code.
 ```
 Grammar of a top-level declaration
 
-top-level-declaration --> statements-OPT
+top-level-declaration --> items-OPT
 ```
 
 
 ## Code Blocks
 
 A *code block* is used by a variety of declarations and control structures
-to group statements together.
+to group items together.
 It has the following form:
 
 ```
 {
-   <#statements#>
+   <#items#>
 }
 ```
 
 
-The *statements* inside a code block include declarations,
+The *items* inside a code block include declarations,
 expressions, and other kinds of statements and are executed in order
 of their appearance in source code.
 
+```
+Grammar of an item
+
+item --> expression ``;``-OPT
+item --> declaration ``;``-OPT
+item --> statement ``;``-OPT
+items --> item items-OPT
+```
+
 @Comment {
   TR: What exactly are the scope rules for Swift?
 }
@@ -102,7 +111,7 @@ of their appearance in source code.
 ```
 Grammar of a code block
 
-code-block --> ``{`` statements-OPT ``}``
+code-block --> ``{`` items-OPT ``}``
 ```
 
 
diff --git a/Sources/TSPL/TSPL.docc/ReferenceManual/Expressions.md b/Sources/TSPL/TSPL.docc/ReferenceManual/Expressions.md
index 57b375b86..c80ad58df 100644
--- a/Sources/TSPL/TSPL.docc/ReferenceManual/Expressions.md
+++ b/Sources/TSPL/TSPL.docc/ReferenceManual/Expressions.md
@@ -1302,7 +1302,7 @@ see <doc:AutomaticReferenceCounting#Resolving-Strong-Reference-Cycles-for-Closur
 ```
 Grammar of a closure expression
 
-closure-expression --> ``{`` attributes-OPT closure-signature-OPT statements-OPT ``}``
+closure-expression --> ``{`` attributes-OPT closure-signature-OPT items-OPT ``}``
 
 closure-signature --> capture-list-OPT closure-parameter-clause ``async``-OPT ``throws``-OPT function-result-OPT ``in``
 closure-signature --> capture-list ``in``
diff --git a/Sources/TSPL/TSPL.docc/ReferenceManual/Statements.md b/Sources/TSPL/TSPL.docc/ReferenceManual/Statements.md
index 16ab36bd9..d89e82d4d 100644
--- a/Sources/TSPL/TSPL.docc/ReferenceManual/Statements.md
+++ b/Sources/TSPL/TSPL.docc/ReferenceManual/Statements.md
@@ -25,8 +25,6 @@ and is used to separate multiple statements if they appear on the same line.
 ```
 Grammar of a statement
 
-statement --> expression ``;``-OPT
-statement --> declaration ``;``-OPT
 statement --> loop-statement ``;``-OPT
 statement --> branch-statement ``;``-OPT
 statement --> labeled-statement ``;``-OPT
@@ -1216,10 +1214,10 @@ Grammar of a conditional compilation block
 
 conditional-compilation-block --> if-directive-clause elseif-directive-clauses-OPT else-directive-clause-OPT endif-directive
 
-if-directive-clause --> if-directive compilation-condition statements-OPT
+if-directive-clause --> if-directive compilation-condition items-OPT
 elseif-directive-clauses --> elseif-directive-clause elseif-directive-clauses-OPT
-elseif-directive-clause --> elseif-directive compilation-condition statements-OPT
-else-directive-clause --> else-directive statements-OPT
+elseif-directive-clause --> elseif-directive compilation-condition items-OPT
+else-directive-clause --> else-directive items-OPT
 if-directive --> ``#if``
 elseif-directive --> ``#elseif``
 else-directive --> ``#else``