diff options
author | Dmitry Petrashko <dark@d-d.me> | 2014-04-01 14:23:40 +0200 |
---|---|---|
committer | Dmitry Petrashko <dark@d-d.me> | 2014-04-01 14:23:40 +0200 |
commit | 2033b5607a41b77590b8d23bf5c40c906a0b42e7 (patch) | |
tree | f5bb05777f221897aa6802e07381230b3a48cf73 | |
parent | e448049027f1aafbe4ae72c859a3368a61592c91 (diff) | |
parent | 1262f3eb41fe8760962f11590a640b4f0ae1bfad (diff) | |
download | dotty-2033b5607a41b77590b8d23bf5c40c906a0b42e7.tar.gz dotty-2033b5607a41b77590b8d23bf5c40c906a0b42e7.tar.bz2 dotty-2033b5607a41b77590b8d23bf5c40c906a0b42e7.zip |
Merge pull request #106 from DarkDimius/fixes-lazy-vals-typo
Fix build: Fix error in lazy-vals.
-rw-r--r-- | src/dotty/tools/dotc/transform/LazyVals.scala | 2 | ||||
-rw-r--r-- | test/test/transform/LazyValsTest.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/transform/LazyVals.scala b/src/dotty/tools/dotc/transform/LazyVals.scala index 650a115a8..8ed09b4b2 100644 --- a/src/dotty/tools/dotc/transform/LazyVals.scala +++ b/src/dotty/tools/dotc/transform/LazyVals.scala @@ -362,7 +362,7 @@ class LazyValTranformContext { val setFlag = Select(Ident(helperModule.termRef), LazyVals.Names.setFlag.toTermName) val wait = Select(Ident(helperModule.termRef), LazyVals.Names.wait4Notification.toTermName) val state = Select(Ident(helperModule.termRef), LazyVals.Names.state.toTermName) - val cas = Select(Ident(helperModule.termRef), LazyVals.Names.compareAndSet.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) if(flag eq EmptyTree) diff --git a/test/test/transform/LazyValsTest.scala b/test/test/transform/LazyValsTest.scala index 6e44f3b15..32cd84b99 100644 --- a/test/test/transform/LazyValsTest.scala +++ b/test/test/transform/LazyValsTest.scala @@ -10,7 +10,7 @@ class LazyValsTest extends DottyTest { def doNotRewriteObjects = { checkCompile("LazyVals", "object O"){ (tree, ctx) => Assert.assertTrue("local lazy shouldn't rewrite module instance definitions", tree.toString.contains( - "ValDef(Modifiers(final module <stable>,,List()),O,Ident(O$),Apply(Select(New(Ident(O$)),<init>),List()))" + "ValDef(Modifiers(final module <stable>,,List()),O," )) } } |