Commit 8665a3c

committed

Allow single-case lambda after colon

1 parent d94c344 commit 8665a3cCopy full SHA for 8665a3c

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1122,6 +1122,8 @@ object Parsers {`
`1122`	`1122`	`else if lookahead.token == LPAREN \|\| lookahead.token == LBRACKET then`
`1123`	`1123`	`lookahead.skipParens()`
`1124`	`1124`	`isArrowIndent()`
	`1125`	`+ else if lookahead.token == CASE then`
	`1126`	`+ Some(() => singleCaseMatch())`
`1125`	`1127`	`else`
`1126`	`1128`	`None`
`1127`	`1129`
`@@ -2378,7 +2380,7 @@ object Parsers {`
`2378`	`2380`
`2379`	`2381`	/** Expr ::= [`implicit'] FunParams (‘=>’ \| ‘?=>’) Expr
`2380`	`2382`	`* \| TypTypeParamClause ‘=>’ Expr`
`2381`		`- * \| ExprCaseClause`
	`2383`	`+ * \| ExprCaseClause -- under experimental.relaxedLambdaSyntax`
`2382`	`2384`	`* \| Expr1`
`2383`	`2385`	`* FunParams ::= Bindings`
`2384`	`2386`	`* \| id`
`@@ -2794,6 +2796,7 @@ object Parsers {`
`2794`	`2796`	`* ColonArgument ::= colon [LambdaStart]`
`2795`	`2797`	`* indent (CaseClauses \| Block) outdent`
`2796`	`2798`	`* \| colon LambdaStart expr ENDlambda -- under experimental.relaxedLambdaSyntax`
	`2799`	`+ * \| colon ExprCaseClause -- under experimental.relaxedLambdaSyntax`
`2797`	`2800`	`* LambdaStart ::= FunParams (‘=>’ \| ‘?=>’)`
`2798`	`2801`	`* \| TypTypeParamClause ‘=>’`
`2799`	`2802`	`* ColonArgBody ::= indent (CaseClauses \| Block) outdent`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -298,6 +298,7 @@ ColonArgument ::= colon [LambdaStart]`
`298`	`298`	`indent (CaseClauses \| Block) outdent`
`299`	`299`	`\| colon LambdaStart expr ENDlambda -- ENDlambda is inserted for each production at next EOL`
`300`	`300`	`-- does not apply if enclosed in parens`
	`301`	`+ \| colon ExprCaseClause`
`301`	`302`	`LambdaStart ::= FunParams (‘=>’ \| ‘?=>’)`
`302`	`303`	`\| TypTypeParamClause ‘=>’`
`303`	`304`	`Quoted ::= ‘'’ ‘{’ Block ‘}’`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,8 @@ val d2: String = xs`
`13`	`13`	`.filter: z => !z.isEmpty`
`14`	`14`	`(0)`
`15`	`15`
	`16`	`+val d3: String = xs`
	`17`	`+ .map: x => x.toString + xs.collect: case y if y > 0 => y`
	`18`	`+ .filter: z => !z.isEmpty`
	`19`	`+ (0)`
	`20`	`+`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,10 @@ case class Foo(x: Int, y: Int)`
`8`	`8`	`val foo = Foo(1, 2)`
`9`	`9`	`assert(g(foo) == 1)`
`10`	`10`
	`11`	`+ val h1: Foo => Int = identity: case Foo(a, b) => a`
	`12`	`+ val h2: Foo => Int = identity: case Foo(a, b) =>`
	`13`	`+ a`
	`14`	`+`
`11`	`15`	`val a1 = Seq((1, 2), (3, 4)).collect(case (a, b) if b > 2 => a)`
`12`	`16`	`assert(a1 == Seq(3))`
`13`	`17`
`@@ -18,4 +22,9 @@ case class Foo(x: Int, y: Int)`
`18`	`22`	`)`
`19`	`23`	`assert(a2 == Seq(1, 3))`
`20`	`24`
	`25`	`+ val a3 = Seq((1, 2), (3, 4)).collect: case (a, b) if b > 2 => a`
	`26`	`+ assert(a3 == Seq(3))`
	`27`	`+`
`21`	`28`	`val partial: PartialFunction[(Int, Int), Int] = case (a, b) if b > 2 => a`
	`29`	`+`
	`30`	`+`

Comments

(0)