Skip to content

Commit 53b89c5

Browse files
committed
Streamline skipBraces as suggested
1 parent a9e513b commit 53b89c5

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -916,18 +916,19 @@ object JavaParsers {
916916
*/
917917
class OutlineJavaParser(source: SourceFile)(implicit ctx: Context) extends JavaParser(source) {
918918

919-
def skipBraces[T](body: T): T = {
919+
def skipBraces(): Unit = {
920920
accept(LBRACE)
921921
var openBraces = 1
922922
while (in.token != EOF && openBraces > 0) {
923923
if (in.token == LBRACE) openBraces += 1
924924
else if (in.token == RBRACE) openBraces -= 1
925925
in.nextToken()
926926
}
927-
body
928927
}
929928

930-
override def typeBody(leadingToken: Int, parentName: Name, parentTParams: List[TypeDef]): (List[Tree], List[Tree]) =
931-
skipBraces((List(EmptyValDef), List(EmptyTree)))
929+
override def typeBody(leadingToken: Int, parentName: Name, parentTParams: List[TypeDef]): (List[Tree], List[Tree]) = {
930+
skipBraces()
931+
(List(EmptyValDef), List(EmptyTree)))
932+
}
932933
}
933934
}

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,7 +2643,7 @@ object Parsers {
26432643
*/
26442644
class OutlineParser(source: SourceFile)(implicit ctx: Context) extends Parser(source) {
26452645

2646-
def skipBraces[T](body: T): T = {
2646+
def skipBraces(): Unit = {
26472647
accept(LBRACE)
26482648
var openBraces = 1
26492649
while (in.token != EOF && openBraces > 0) {
@@ -2654,11 +2654,16 @@ object Parsers {
26542654
in.nextToken()
26552655
}
26562656
}
2657-
body
26582657
}
26592658

2660-
override def blockExpr(): Tree = skipBraces(EmptyTree)
2659+
override def blockExpr(): Tree = {
2660+
skipBraces()
2661+
EmptyTree
2662+
}
26612663

2662-
override def templateBody() = skipBraces((EmptyValDef, List(EmptyTree)))
2664+
override def templateBody() = {
2665+
skipBraces()
2666+
(EmptyValDef, List(EmptyTree)))
2667+
}
26632668
}
26642669
}

0 commit comments

Comments
 (0)