From e197cf8e72ad126d9bcdd0bb1d79b888e80cfca9 Mon Sep 17 00:00:00 2001 From: Adriaan Moors Date: Wed, 12 Mar 2014 14:58:40 -0700 Subject: SI-4249 try/catch accepts expression --- 15-scala-syntax-summary.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to '15-scala-syntax-summary.md') 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 -- cgit v1.2.3