diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-05-05 15:25:24 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-05-05 15:25:24 +0200 |
| commit | 2fdf660aba6a23a5adb665bd1af4d54e8952034c (patch) | |
| tree | cfa7c73960c107f9f6b158f5ec19c8a7aee6ea88 /src/dotty/tools/dotc/core/Definitions.scala | |
| parent | 7129cbe60c062be49aef8c27da461a11416e189c (diff) | |
| download | dotty-2fdf660aba6a23a5adb665bd1af4d54e8952034c.tar.gz dotty-2fdf660aba6a23a5adb665bd1af4d54e8952034c.tar.bz2 dotty-2fdf660aba6a23a5adb665bd1af4d54e8952034c.zip | |
Allow to compile root import classes without special option.
Can now compile Predef/DottyPredef without -Yno-import option.
Achieved by making some parts of imports more lazy.
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index c21620048..a1b44ec34 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -449,7 +449,9 @@ class Definitions { lazy val isPolymorphicAfterErasure = Set[Symbol](Any_isInstanceOf, Any_asInstanceOf, newRefArrayMethod) - lazy val RootImports = List[Symbol](JavaLangPackageVal, ScalaPackageVal, ScalaPredefModule, DottyPredefModule) + val RootImportFns = List[() => Symbol](() => JavaLangPackageVal, () => ScalaPackageVal, () => ScalaPredefModule, () => DottyPredefModule) + + lazy val RootImports = RootImportFns.map(_()) def isTupleType(tp: Type)(implicit ctx: Context) = { val arity = tp.dealias.argInfos.length |