*** empty log message ***

2 files changed, 2 insertions, 4 deletions

diff --git a/sources/scala/tools/nsc/symtab/Symbols.scala b/sources/scala/tools/nsc/symtab/Symbols.scala
index 9f2b3b5643..de81371727 100755
--- a/sources/scala/tools/nsc/symtab/Symbols.scala
+++ b/sources/scala/tools/nsc/symtab/Symbols.scala
@@ -605,7 +605,7 @@ import Flags._;
      *  term symbol rename it by expanding its name to avoid name clashes
      */
     final def makeNotPrivate(base: Symbol): unit =
-      if (isTerm && !(this hasFlag notPRIVATE) && (this hasFlag PRIVATE) || this.owner.isTerm) {
+      if (isTerm && !(this hasFlag notPRIVATE) && ((this hasFlag PRIVATE) || this.owner.isTerm)) {
         setFlag(notPRIVATE);
         if (!hasFlag(DEFERRED)) setFlag(lateFINAL);
         expandName(base)
diff --git a/sources/scala/tools/nsc/transform/Constructors.scala b/sources/scala/tools/nsc/transform/Constructors.scala
index 54f1cc26d7..f7f787d3f2 100755
--- a/sources/scala/tools/nsc/transform/Constructors.scala
+++ b/sources/scala/tools/nsc/transform/Constructors.scala
@@ -55,11 +55,9 @@ abstract class Constructors extends Transform {
 	override def transform(tree: Tree): Tree = tree match {
 	  case Apply(Select(This(_), _), List())
 	  if ((tree.symbol hasFlag PARAMACCESSOR) && tree.symbol.owner == clazz) =>
-            thisRefSeen = true;
             gen.Ident(parameter(tree.symbol.accessed)) setPos tree.pos;
 	  case Select(This(_), _)
 	  if ((tree.symbol hasFlag PARAMACCESSOR) && tree.symbol.owner == clazz) =>
-            thisRefSeen = true;
 	    gen.Ident(parameter(tree.symbol)) setPos tree.pos;
           case This(_) =>
             thisRefSeen = true;
@@ -110,7 +108,7 @@ abstract class Constructors extends Transform {
 	    defBuf += copy.ValDef(stat, mods, name, tpt, EmptyTree)
 	  }
         case ClassDef(_, _, _, _, _) =>
-          defBuf += transform(stat)
+          defBuf += (new ConstructorTransformer).transform(stat)
 	case _ =>
 	  constrStatBuf += intoConstructor(impl.symbol, stat)
       }