Merge pull request #1 from som-snytt/issue/7937

SI-7937 In for, semi before guard never required

Author: adriaanm

08-expressions.md

@@ -931,11 +931,8 @@ A semicolon preceding the `while` symbol of a do loop expression is ignored.
 ``` 
 Expr1          ::=  `for' (`(' Enumerators `)' | `{' Enumerators `}') 
                        {nl} [`yield'] Expr
-Enumerators    ::=  Generator {semi Enumerator}
-Enumerator     ::=  Generator 
-                 |  Guard
-                 |  Pattern1 `=' Expr
-Generator      ::=  Pattern1 `<-' Expr [Guard]
+Enumerators    ::=  Generator {semi Generator}
+Generator      ::=  Pattern1 `<-' Expr {[semi] Guard | semi Pattern1 `=' Expr}
 Guard          ::=  `if' PostfixExpr
 ```
 

15-scala-syntax-summary.md

@@ -152,11 +152,8 @@ grammar.
   ResultExpr        ::=  Expr1
                       |  (Bindings | ([‘implicit’] id | ‘_’) ‘:’ CompoundType) ‘=>’ Block
 
-  Enumerators       ::=  Generator {semi Enumerator}
-  Enumerator        ::=  Generator
-                      |  Guard
-                      |  Pattern1 ‘=’ Expr
-  Generator         ::=  Pattern1 ‘<-’ Expr [Guard]
+  Enumerators       ::=  Generator {semi Generator}
+  Generator         ::=  Pattern1 ‘<-’ Expr {[semi] Guard | semi Pattern1 ‘=’ Expr}
 
   CaseClauses       ::=  CaseClause { CaseClause }
   CaseClause        ::=  ‘case’ Pattern [Guard] ‘=>’ Block