aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/Compiler.scala
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2015-06-06 11:00:59 +0200
committerodersky <odersky@gmail.com>2015-06-06 11:00:59 +0200
commit6ca52b0f23f0c3425d054d0918a149e0e7afb765 (patch)
tree2feaae75dc15cde118cc7fafc5912fa50247d3bd /src/dotty/tools/dotc/Compiler.scala
parentc0770edba1f5ba85b5a48f2c2ce68704dbe00087 (diff)
parent0cdb29904affbf55d5f08a005e8b96acfd73aa81 (diff)
downloaddotty-6ca52b0f23f0c3425d054d0918a149e0e7afb765.tar.gz
dotty-6ca52b0f23f0c3425d054d0918a149e0e7afb765.tar.bz2
dotty-6ca52b0f23f0c3425d054d0918a149e0e7afb765.zip
Merge pull request #622 from dotty-staging/add/implement-scala2-traits
Implement Scala2 traits
Diffstat (limited to 'src/dotty/tools/dotc/Compiler.scala')
-rw-r--r--src/dotty/tools/dotc/Compiler.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/Compiler.scala b/src/dotty/tools/dotc/Compiler.scala
index d7ef44144..386f976cf 100644
--- a/src/dotty/tools/dotc/Compiler.scala
+++ b/src/dotty/tools/dotc/Compiler.scala
@@ -56,6 +56,7 @@ class Compiler {
new Getters,
new ClassTags,
new ElimByName,
+ new AugmentScala2Traits,
new ResolveSuper),
List(new Erasure),
List(new ElimErasedValueType,
@@ -63,6 +64,7 @@ class Compiler {
new Mixin,
new LazyVals,
new Memoize,
+ new LinkScala2ImplClasses,
new CapturedVars, // capturedVars has a transformUnit: no phases should introduce local mutable vars here
new Constructors,
new FunctionalInterfaces),
@@ -74,7 +76,6 @@ class Compiler {
new ExpandPrivate,
new CollectEntryPoints,
new LabelDefs,
- new ElimWildcardIdents,
new TraitConstructors),
List(new GenBCode)
)