summaryrefslogtreecommitdiff
path: root/08-expressions.md
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-03-12 14:58:40 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2014-03-12 14:58:40 -0700
commite197cf8e72ad126d9bcdd0bb1d79b888e80cfca9 (patch)
tree6ede24322fe03dc0044dc55b5801841afb8bc522 /08-expressions.md
parent622ffd476c21a097407f18d024bc143f42d920f5 (diff)
downloadscala-e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9.tar.gz
scala-e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9.tar.bz2
scala-e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9.zip
SI-4249 try/catch accepts expression
Diffstat (limited to '08-expressions.md')
-rw-r--r--08-expressions.md8
1 files changed, 3 insertions, 5 deletions
diff --git a/08-expressions.md b/08-expressions.md
index ba237d4952..71a18bdb8e 100644
--- a/08-expressions.md
+++ b/08-expressions.md
@@ -3,13 +3,11 @@
```
Expr ::= (Bindings | id | `_') `=>' Expr
| Expr1
- Expr1 ::= `if' `(' Expr `)' {nl} Expr [[semi] else Expr]
+ Expr1 ::= `if' `(' Expr `)' {nl} Expr [[semi] `else' Expr]
| `while' `(' Expr `)' {nl} Expr
- | `try' `{' Block `}' [`catch' `{' CaseClauses `}']
- [`finally' Expr]
+ | `try' (`{' Block `}' | Expr) [`catch' `{' CaseClauses `}'] [`finally' Expr]
| `do' Expr [semi] `while' `(' Expr ')'
- | `for' (`(' Enumerators `)' | `{' Enumerators `}')
- {nl} [`yield'] Expr
+ | `for' (`(' Enumerators `)' | `{' Enumerators `}') {nl} [`yield'] Expr
| `throw' Expr
| `return' [Expr]
| [SimpleExpr `.'] id `=' Expr