diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2015-05-02 18:48:08 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2015-05-02 18:48:08 +0200 |
| commit | ac46a0e4489bba4f76863cc1491bf2b8441ed1cb (patch) | |
| tree | 35cb0aa59d10931f6201f1069d70172a43228a86 /src/dotty/tools/dotc/core/Definitions.scala | |
| parent | 2dbabca38cee0ff27c92a9a7079959b2461c9869 (diff) | |
| parent | 10a5f9198f03ae5b8dc54f1113f98da585c4e81a (diff) | |
| download | dotty-ac46a0e4489bba4f76863cc1491bf2b8441ed1cb.tar.gz dotty-ac46a0e4489bba4f76863cc1491bf2b8441ed1cb.tar.bz2 dotty-ac46a0e4489bba4f76863cc1491bf2b8441ed1cb.zip | |
Merge pull request #507 from dotty-staging/add/from-tasty
Compile from Tasty
Diffstat (limited to 'src/dotty/tools/dotc/core/Definitions.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Definitions.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Definitions.scala b/src/dotty/tools/dotc/core/Definitions.scala index 7de254008..3c36b1a1e 100644 --- a/src/dotty/tools/dotc/core/Definitions.scala +++ b/src/dotty/tools/dotc/core/Definitions.scala @@ -4,7 +4,7 @@ package core import Types._, Contexts._, Symbols._, Denotations._, SymDenotations._, StdNames._, Names._ import Flags._, Scopes._, Decorators._, NameOps._, util.Positions._ -import pickling.UnPickler.ensureConstructor +import pickling.Scala2Unpickler.ensureConstructor import scala.annotation.{ switch, meta } import scala.collection.{ mutable, immutable } import PartialFunction._ @@ -99,7 +99,8 @@ class Definitions { lazy val RootPackage: TermSymbol = ctx.newSymbol( NoSymbol, nme.ROOTPKG, PackageCreationFlags, TypeRef(NoPrefix, RootClass)) - lazy val EmptyPackageVal = ctx.newCompletePackageSymbol(RootClass, nme.EMPTY_PACKAGE).entered + lazy val EmptyPackageVal = ctx.newPackageSymbol( + RootClass, nme.EMPTY_PACKAGE, (emptypkg, emptycls) => ctx.rootLoader(emptypkg)).entered lazy val EmptyPackageClass = EmptyPackageVal.moduleClass.asClass /** A package in which we can place all methods that are interpreted specially by the compiler */ |