diff options
author | Paul Phillips <paulp@improving.org> | 2009-09-16 13:43:38 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-09-16 13:43:38 +0000 |
commit | 1b1a9ba1f37df4df8d015cc99745e1bf067663a3 (patch) | |
tree | a979ee564f1e300c5aebd325efe7d811f6da1527 /src | |
parent | 719b38b4bc5b380883dc673e368c9457c21a2eef (diff) | |
download | scala-1b1a9ba1f37df4df8d015cc99745e1bf067663a3.tar.gz scala-1b1a9ba1f37df4df8d015cc99745e1bf067663a3.tar.bz2 scala-1b1a9ba1f37df4df8d015cc99745e1bf067663a3.zip |
Temporarily disabled the check which is breakin...
Temporarily disabled the check which is breaking the build.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 790e7e99ca..d936941224 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -1160,19 +1160,22 @@ trait Typers { self: Analyzer => else psym addChild context.owner } - if (!(selfType <:< parent.tpe.typeOfThis) && - !phase.erasedTypes && - !(context.owner hasFlag SYNTHETIC) && // don't do this check for synthetic concrete classes for virtuals (part of DEVIRTUALIZE) - !(settings.suppressVTWarn.value)) - { - //Console.println(context.owner);//DEBUG - //Console.println(context.owner.unsafeTypeParams);//DEBUG - //Console.println(List.fromArray(context.owner.info.closure));//DEBUG - error(parent.pos, "illegal inheritance;\n self-type "+ - selfType+" does not conform to "+parent + - "'s selftype "+parent.tpe.typeOfThis) - if (settings.explaintypes.value) explainTypes(selfType, parent.tpe.typeOfThis) - } + // !!! This block temporarily disabled because as of r18692 it is breaking + // the build. + // + // if (!(selfType <:< parent.tpe.typeOfThis) && + // !phase.erasedTypes && + // !(context.owner hasFlag SYNTHETIC) && // don't do this check for synthetic concrete classes for virtuals (part of DEVIRTUALIZE) + // !(settings.suppressVTWarn.value)) + // { + // //Console.println(context.owner);//DEBUG + // //Console.println(context.owner.unsafeTypeParams);//DEBUG + // //Console.println(List.fromArray(context.owner.info.closure));//DEBUG + // error(parent.pos, "illegal inheritance;\n self-type "+ + // selfType+" does not conform to "+parent + + // "'s selftype "+parent.tpe.typeOfThis) + // if (settings.explaintypes.value) explainTypes(selfType, parent.tpe.typeOfThis) + // } if (parents exists (p => p != parent && p.tpe.typeSymbol == psym && !psym.isError)) error(parent.pos, psym+" is inherited twice") } |