summaryrefslogtreecommitdiff
path: root/15-scala-syntax-summary.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 /15-scala-syntax-summary.md
parent622ffd476c21a097407f18d024bc143f42d920f5 (diff)
downloadscala-e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9.tar.gz
scala-e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9.tar.bz2
scala-e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9.zip
SI-4249 try/catch accepts expression
Diffstat (limited to '15-scala-syntax-summary.md')
-rw-r--r--15-scala-syntax-summary.md22
1 files changed, 10 insertions, 12 deletions
diff --git a/15-scala-syntax-summary.md b/15-scala-syntax-summary.md
index fcf93b7ab0..65ccc5f08c 100644
--- a/15-scala-syntax-summary.md
+++ b/15-scala-syntax-summary.md
@@ -108,20 +108,18 @@ grammar.
Expr ::= (Bindings | [‘implicit’] id | ‘_’) ‘=>’ Expr
| Expr1
- Expr1 ::= ‘if’ ‘(’ Expr ‘)’ {nl} Expr [[semi] else Expr]
- | ‘while’ ‘(’ Expr ‘)’ {nl} Expr
- | ‘try’ ‘{’ Block ‘}’ [‘catch’ ‘{’ CaseClauses ‘}’]
- [‘finally’ Expr]
- | ‘do’ Expr [semi] ‘while’ ‘(’ Expr ‘)’
- | ‘for’ (‘(’ Enumerators ‘)’ | ‘{’ Enumerators ‘}’)
- {nl} [‘yield’] Expr
- | ‘throw’ Expr
- | ‘return’ [Expr]
- | [SimpleExpr ‘.’] id ‘=’ Expr
- | SimpleExpr1 ArgumentExprs ‘=’ Expr
+ Expr1 ::= `if' `(' Expr `)' {nl} Expr [[semi] `else' Expr]
+ | `while' `(' Expr `)' {nl} Expr
+ | `try' (`{' Block `}' | Expr) [`catch' `{' CaseClauses `}'] [`finally' Expr]
+ | `do' Expr [semi] `while' `(' Expr ')'
+ | `for' (`(' Enumerators `)' | `{' Enumerators `}') {nl} [`yield'] Expr
+ | `throw' Expr
+ | `return' [Expr]
+ | [SimpleExpr `.'] id `=' Expr
+ | SimpleExpr1 ArgumentExprs `=' Expr
| PostfixExpr
| PostfixExpr Ascription
- | PostfixExpr ‘match’ ‘{’ CaseClauses ‘}’
+ | PostfixExpr `match' `{' CaseClauses `}'
PostfixExpr ::= InfixExpr [id [nl]]
InfixExpr ::= PrefixExpr
| InfixExpr id [nl] InfixExpr