diff options
| author | odersky <odersky@gmail.com> | 2016-03-18 11:29:21 +0100 |
|---|---|---|
| committer | odersky <odersky@gmail.com> | 2016-03-18 11:29:21 +0100 |
| commit | d875fef31d984198489a3f94bdb4894698ad0cdb (patch) | |
| tree | c1bde010d9911206003f4eeea2862fed814a1945 /src/dotty/tools/dotc/Compiler.scala | |
| parent | cdbc1631d1eda5a1a3eaa708b585a6a052852646 (diff) | |
| parent | 122b0351e3e5d0fbacf2aab9bbcc7cd57a4f7dc9 (diff) | |
| download | dotty-d875fef31d984198489a3f94bdb4894698ad0cdb.tar.gz dotty-d875fef31d984198489a3f94bdb4894698ad0cdb.tar.bz2 dotty-d875fef31d984198489a3f94bdb4894698ad0cdb.zip | |
Merge pull request #1148 from sjrd/scalajs-gen-exprs
Implement most of the Scala.js IR code generator.
Diffstat (limited to 'src/dotty/tools/dotc/Compiler.scala')
| -rw-r--r-- | src/dotty/tools/dotc/Compiler.scala | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/Compiler.scala b/src/dotty/tools/dotc/Compiler.scala index d9f1a3dca..fe16243bb 100644 --- a/src/dotty/tools/dotc/Compiler.scala +++ b/src/dotty/tools/dotc/Compiler.scala @@ -104,7 +104,11 @@ class Compiler { def rootContext(implicit ctx: Context): Context = { ctx.initialize()(ctx) val actualPhases = if (ctx.settings.scalajs.value) { - phases + // Remove phases that Scala.js does not want + phases.mapConserve(_.filter { + case _: FunctionalInterfaces => false + case _ => true + }).filter(_.nonEmpty) } else { // Remove Scala.js-related phases phases.mapConserve(_.filter { |