diff options
| author | Dmitry Petrashko <dark@d-d.me> | 2014-05-20 16:07:00 +0200 |
|---|---|---|
| committer | Dmitry Petrashko <dark@d-d.me> | 2014-05-20 16:07:00 +0200 |
| commit | 7bc5cd18ee4f881f223e9a317e6c6a329942d5af (patch) | |
| tree | 179a5daa9d3d7aab55c81364e114267e038de302 /src/dotty/tools/dotc/transform | |
| parent | deea15e9b0c56b7f55f5e40665d5e00baef4f028 (diff) | |
| parent | 58bbd56e66d65968e884384fe36f2a61a1daa721 (diff) | |
| download | dotty-7bc5cd18ee4f881f223e9a317e6c6a329942d5af.tar.gz dotty-7bc5cd18ee4f881f223e9a317e6c6a329942d5af.tar.bz2 dotty-7bc5cd18ee4f881f223e9a317e6c6a329942d5af.zip | |
Merge pull request #132 from DarkDimius/small-fixes
Small fixes
Diffstat (limited to 'src/dotty/tools/dotc/transform')
| -rw-r--r-- | src/dotty/tools/dotc/transform/CreateCompanionObjects.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/transform/LazyVals.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/transform/CreateCompanionObjects.scala b/src/dotty/tools/dotc/transform/CreateCompanionObjects.scala index f1131b3f2..b1cc8ea52 100644 --- a/src/dotty/tools/dotc/transform/CreateCompanionObjects.scala +++ b/src/dotty/tools/dotc/transform/CreateCompanionObjects.scala @@ -38,7 +38,7 @@ abstract class CreateCompanionObjects extends TreeTransform { else { val moduleSymbol = ctx.newCompleteModuleSymbol(claz.symbol.owner, claz.name.toTermName, Flags.Synthetic, Flags.Synthetic, List(defn.ObjectClass.typeRef), Scopes.newScope) if (moduleSymbol.owner.isClass) moduleSymbol.entered - val companion = tpd.ModuleDef(moduleSymbol, List(EmptyTree)) + val companion = tpd.ModuleDef(moduleSymbol, List(EmptyTree)).withPos(claz.pos) acc += claz acc += companion transformStats0(stats, acc) diff --git a/src/dotty/tools/dotc/transform/LazyVals.scala b/src/dotty/tools/dotc/transform/LazyVals.scala index 527c7e228..fe6c3e2e4 100644 --- a/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/src/dotty/tools/dotc/transform/LazyVals.scala @@ -379,7 +379,7 @@ class LazyValTranformContext { val state = Select(Ident(helperModule.termRef), LazyVals.Names.state.toTermName) val cas = Select(Ident(helperModule.termRef), LazyVals.Names.cas.toTermName) - val accessor = mkThreadSafeDef(x.symbol.asTerm, claz, ord, containerSymbol, rhs, x.tpe, offset, getFlag, state, cas, setFlag, wait) + val accessor = mkThreadSafeDef(x.symbol.asTerm, claz, ord, containerSymbol, rhs, tpe, offset, getFlag, state, cas, setFlag, wait) if(flag eq EmptyTree) Thicket(List(containerTree, accessor)) else Thicket(List(containerTree, flag, accessor)) |