From 2b3d017d5f6a196c612af1e4eb677b6d970b0a25 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 16 Feb 2017 16:49:49 -0800 Subject: fix recent regression: macro paradise + Java sources = MatchError fixes https://github.com/scala/scala-dev/issues/303 ; the regression was in https://github.com/scala/scala/pull/5585 --- src/reflect/scala/reflect/internal/ReificationSupport.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/reflect') diff --git a/src/reflect/scala/reflect/internal/ReificationSupport.scala b/src/reflect/scala/reflect/internal/ReificationSupport.scala index 1b2be64654..21320149a3 100644 --- a/src/reflect/scala/reflect/internal/ReificationSupport.scala +++ b/src/reflect/scala/reflect/internal/ReificationSupport.scala @@ -351,9 +351,13 @@ trait ReificationSupport { self: SymbolTable => List[Tree], List[Tree], ValDef, List[Tree])] = tree match { case ClassDef(mods, name, tparams, impl) => val X = if (mods.isCase) UnMkTemplate.asCase else UnMkTemplate - val X(parents, selfType, ctorMods, vparamss, earlyDefs, body) = impl - if (ctorMods.isTrait || ctorMods.hasFlag(JAVA)) None - else Some((mods, name, tparams, ctorMods, vparamss, earlyDefs, parents, selfType, body)) + impl match { + case X(parents, selfType, ctorMods, vparamss, earlyDefs, body) + if (!ctorMods.isTrait && !ctorMods.hasFlag(JAVA)) => + Some((mods, name, tparams, ctorMods, vparamss, earlyDefs, parents, selfType, body)) + case _ => + None + } case _ => None } -- cgit v1.2.3