*** empty log message ***

3 files changed, 4 insertions, 3 deletions

diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala
index c065cc60eb..3545d18b5d 100755
--- a/sources/scala/tools/nsc/Global.scala
+++ b/sources/scala/tools/nsc/Global.scala
@@ -16,7 +16,7 @@ import util._;
 import ast._;
 import ast.parser._;
 import typechecker._;
-import matching._;
+//import matching._;
 import transform._;
 
 class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable with Trees with CompilationUnits {
diff --git a/sources/scala/tools/nsc/typechecker/Namers.scala b/sources/scala/tools/nsc/typechecker/Namers.scala
index 4b1a2ec39f..87aa573efa 100755
--- a/sources/scala/tools/nsc/typechecker/Namers.scala
+++ b/sources/scala/tools/nsc/typechecker/Namers.scala
@@ -137,7 +137,7 @@ trait Namers: Analyzer {
 	  case ClassDef(mods, name, tparams, _, _) =>
 	    if ((mods & (CASE | ABSTRACT)) == CASE) { // enter case factory method.
 	      tree.symbol = enterCaseFactorySymbol(
-		tree.pos, mods & AccessFlags | CASE, name.toTermName)
+		tree.pos, mods & AccessFlags | METHOD | CASE, name.toTermName)
 		setInfo innerNamer.caseFactoryCompleter(tree)
 	    }
 	    tree.symbol = enterClassSymbol(tree.pos, mods, name);
diff --git a/sources/scala/tools/nsc/typechecker/RefChecks.scala b/sources/scala/tools/nsc/typechecker/RefChecks.scala
index 9f8ec0aa2f..50798d65a2 100755
--- a/sources/scala/tools/nsc/typechecker/RefChecks.scala
+++ b/sources/scala/tools/nsc/typechecker/RefChecks.scala
@@ -526,7 +526,7 @@ abstract class RefChecks extends Transform {
 	var tpe = tree.tpe;
 	while (!tpe.symbol.isClass) tpe = tpe.resultType;
 	assert(tpe.symbol hasFlag CASE);
-	typedOperator(atPos(tree.pos)(Select(New(TypeTree(tpe)), tpe.symbol.primaryConstructor)))
+	typedOperator(atPos(tree.pos)(Select(New(TypeTree(tpe)), tpe.symbol.primaryConstructor)));
       }
 
       /* Check whether argument types conform to bounds of type parameters */
@@ -571,6 +571,7 @@ abstract class RefChecks extends Transform {
 
 	case TypeApply(fn, args) =>
 	  checkBounds(fn.tpe.typeParams, args map (.tpe));
+	  if (sym.isMethod && sym.hasFlag(CASE)) result = toConstructor;
 
 	case New(tpt) =>
 	  enterReference(tree.pos, tpt.tpe.symbol);