Skip to content

Commit 3c83376

Browse files
committed
fix recent regression: macro paradise + Java sources = MatchError
fixes scala/scala-dev#303 ; the regression was in scala#5585
1 parent c8b8005 commit 3c83376

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/reflect/scala/reflect/internal/ReificationSupport.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,13 @@ trait ReificationSupport { self: SymbolTable =>
351351
List[Tree], List[Tree], ValDef, List[Tree])] = tree match {
352352
case ClassDef(mods, name, tparams, impl) =>
353353
val X = if (mods.isCase) UnMkTemplate.asCase else UnMkTemplate
354-
val X(parents, selfType, ctorMods, vparamss, earlyDefs, body) = impl
355-
if (ctorMods.isTrait || ctorMods.hasFlag(JAVA)) None
356-
else Some((mods, name, tparams, ctorMods, vparamss, earlyDefs, parents, selfType, body))
354+
impl match {
355+
case X(parents, selfType, ctorMods, vparamss, earlyDefs, body) =>
356+
if (ctorMods.isTrait || ctorMods.hasFlag(JAVA)) None
357+
else Some((mods, name, tparams, ctorMods, vparamss, earlyDefs, parents, selfType, body))
358+
case _ =>
359+
None
360+
}
357361
case _ =>
358362
None
359363
}

0 commit comments

Comments
 (0)