diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2006-02-20 18:06:20 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2006-02-20 18:06:20 +0000 |
| commit | c8db5e2c18de75efcf6c907518459b0563950550 (patch) | |
| tree | 52571adc467c88f23da7b51487bd307ea7be9f2e /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | b78ee4f8b8cbccc07502d24dc7edbb272d8e3e96 (diff) | |
| download | scala-c8db5e2c18de75efcf6c907518459b0563950550.tar.gz scala-c8db5e2c18de75efcf6c907518459b0563950550.tar.bz2 scala-c8db5e2c18de75efcf6c907518459b0563950550.zip | |
Undoing the changes made on my last commit.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 1f909a6f10..31291b099e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -504,7 +504,7 @@ mixin class Typers requires Analyzer { // If first parent is a mixin class, make it first mixin and add its superclass as first parent while (supertpt.tpe.symbol != null && supertpt.tpe.symbol.initialize.isMixin) { mixins = typedType(supertpt) :: mixins - supertpt = TypeTree(supertpt.tpe.parents.head) /* setOriginal supertpt */ setPos supertpt.pos + supertpt = TypeTree(supertpt.tpe.parents.head) setOriginal supertpt /* setPos supertpt.pos */ } if (supertpt.hasSymbol) { val tparams = supertpt.symbol.typeParams @@ -614,7 +614,7 @@ mixin class Typers requires Analyzer { DefDef(getter, vparamss => if (mods hasFlag DEFERRED) EmptyTree else typed(atPos(vdef.pos)(Select(This(value.owner), value)), EXPRmode, value.tpe))) - result.tpt.asInstanceOf[TypeTree] /* XXX: setOriginal tpt */ setPos tpt.pos + result.tpt.asInstanceOf[TypeTree] setOriginal tpt /* setPos tpt.pos */ checkNoEscaping.privates(getter, result.tpt) result } |