diff options
| author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-09-17 16:36:10 +0000 |
|---|---|---|
| committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-09-17 16:36:10 +0000 |
| commit | a205b6b06e705711308c9ad3abac74ba66b6266f (patch) | |
| tree | 49aa189b4917b20d76c2da02cbf9475af5a49662 /src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala | |
| parent | 3f9b82c88d74c1b03daf5131b50c172213f40a63 (diff) | |
| download | scala-a205b6b06e705711308c9ad3abac74ba66b6266f.tar.gz scala-a205b6b06e705711308c9ad3abac74ba66b6266f.tar.bz2 scala-a205b6b06e705711308c9ad3abac74ba66b6266f.zip | |
Massive check-in for IDE.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala index 1cdcf6210a..938a07f5bf 100644 --- a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala +++ b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala @@ -34,10 +34,21 @@ trait EtaExpansion { self: Analyzer => * tree is already attributed * </p> */ - def etaExpand(tree: Tree): Tree = { + def etaExpand(unit : CompilationUnit, tree: Tree): Tree = { val tpe = tree.tpe - var cnt = 0 - def freshName() = { cnt = cnt + 1; newTermName("eta$" + cnt) } + val symbolHash = if (!inIDE) "" else Integer.toString(tree.symbol.hashCode, 10 + ('z' - 'a')) + "$" + var cnt = 0 // for NoPosition + def freshName(pos : util.Position, n : Int) = { + cnt += 1 + if (pos == util.NoPosition) { + newTermName("eta$" + symbolHash + (cnt - 1)) + } else if (n == 0) { + newTermName(unit.fresh.newName(pos, "eta$" + symbolHash)) + } else { + newTermName(unit.fresh.newName(pos, "eta$" + symbolHash + n + "$")) + } + } + // { cnt = cnt + 1; newTermName("eta$" + cnt) } val defs = new ListBuffer[Tree] /** Append to <code>defs</code> value definitions for all non-stable @@ -50,7 +61,7 @@ trait EtaExpansion { self: Analyzer => def liftout(tree: Tree): Tree = if (treeInfo.isPureExpr(tree)) tree else { - val vname: Name = freshName() + val vname: Name = freshName(tree.pos, 0) defs += atPos(tree.pos)(ValDef(Modifiers(SYNTHETIC), vname, TypeTree(), tree)) Ident(vname) setPos tree.pos } @@ -76,8 +87,13 @@ trait EtaExpansion { self: Analyzer => case mt: ImplicitMethodType => tree case MethodType(formals, restpe) => + var cnt0 = 0 + def cnt = { + cnt0 += 1 + cnt0 - 1 + } val params = formals map (formal => - ValDef(Modifiers(SYNTHETIC | PARAM), freshName(), TypeTree() + ValDef(Modifiers(SYNTHETIC | PARAM), freshName(tree.pos, cnt), TypeTree() .setType(formal), EmptyTree)) val args = params map (param => Ident(param.name)) val applyArgs = |