Skip to content

Commit ebc7cb9

Browse files
committed
nits: cleanup imports
1 parent f564d49 commit ebc7cb9

12 files changed

+10
-26
lines changed

src/main/scala/scalacl/impl/ConcurrentCache.scala

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ package scalacl.impl
3636
class ConcurrentCache[K, V <: AnyRef] {
3737
private val map = new java.util.concurrent.ConcurrentHashMap[K, V]
3838

39+
/**
40+
* Since the map is not synchronized, we may be creating the value
41+
* with {@code initialValue} concurrently with other threads.
42+
* When inserting in the {@code ConcurrentHashMap}, only one
43+
* initial value will be effectively inserted, the other values will
44+
* be discarded.
45+
*/
3946
def apply(key: K, discardValue: V => Unit)(initialValue: => V) = {
4047
val value = map.get(key)
4148
if (value != null) {
@@ -46,6 +53,7 @@ class ConcurrentCache[K, V <: AnyRef] {
4653
if (oldValue eq null) {
4754
newValue
4855
} else {
56+
// A concurrent insertion was quicker than us: discard our new value.
4957
discardValue(newValue)
5058
oldValue
5159
}
@@ -64,4 +72,4 @@ class ConcurrentCache[K, V <: AnyRef] {
6472
}
6573
}
6674
}
67-
}
75+
}

src/main/scala/scalacl/impl/KernelMacros.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ package scalacl.impl
3333
import scala.reflect
3434
import scalaxy.streams.Streams
3535
import scalaxy.streams.WithMacroContext
36-
// import scalaxy.components.WithMacroContext
3736

3837
import language.experimental.macros
3938

src/main/scala/scalacl/impl/KernelSymbolsAnalysis.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,10 @@ package impl
3333

3434
import scala.language.reflectiveCalls
3535

36-
// import scalaxy.components.CommonScalaNames
37-
// import scalaxy.components.MiscMatchers
3836

3937
trait KernelSymbolsAnalysis
4038
extends CommonScalaNames
4139
with CodeConversionResults
42-
// with MiscMatchers
4340
with SymbolKinds
4441
with SymbolExtensions {
4542
val global: reflect.api.Universe

src/main/scala/scalacl/impl/OpenCLCodeFlattening.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ import scala.reflect.NameTransformer.{ encode, decode }
4444
import scala.reflect.api.Universe
4545

4646
trait OpenCLCodeFlattening
47-
// extends TreeBuilders
48-
// with MiscMatchers
4947
extends TupleAnalysis
5048
with CommonScalaNames
5149
with WhileLoops

src/main/scala/scalacl/impl/OpenCLConverter.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,13 @@
3131
package scalacl
3232
package impl
3333

34-
// import scalaxy.components.CommonScalaNames
35-
// import scalacl.impl.FlatCode
3634
import scalacl.impl.FlatCodes._
3735
import scalaxy.streams.Streams
3836

3937
import scala.reflect.NameTransformer
4038

4139
trait OpenCLConverter
4240
extends OpenCLCodeFlattening
43-
// with CommonScalaNames
4441
with Streams
4542
with KernelSymbolsAnalysis {
4643
val global: reflect.api.Universe

src/main/scala/scalacl/impl/SymbolExtensions.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ package impl
3333

3434
import scala.language.implicitConversions
3535

36-
// import scalaxy.components.CommonScalaNames
37-
// import scalaxy.components.MiscMatchers
3836

3937
trait SymbolExtensions {
4038
val global: reflect.api.Universe

src/main/scala/scalacl/impl/SymbolKinds.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
package scalacl
3232
package impl
3333

34-
// import scalaxy.components.Tuploids
35-
// import scalaxy.components.CommonScalaNames
3634
import scalaxy.streams.TuploidValues
3735

3836
// trait SymbolKinds extends Tuploids with CommonScalaNames {

src/main/scala/scalacl/impl/Vectorization.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ import scala.collection.immutable.NumericRange
3737
import scalacl.CLArray
3838
import scalacl.CLFilteredArray
3939

40-
//import scalaxy.components.MiscMatchers
4140
import scalaxy.streams.Streams
4241

4342
trait Vectorization
44-
extends CodeGeneration // with MiscMatchers
43+
extends CodeGeneration
4544
with Streams {
4645
val global: Universe
4746
import global._

src/main/scala/scalacl/impl/conversion/CodeConversion.scala

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131
package scalacl.impl
32-
// import scalacl.impl.FlatCode
3332
import scalacl.impl.FlatCodes._
34-
// import scalaxy.components.StreamTransformers
3533
import scalaxy.streams.StreamTransforms
3634

3735
import scalacl.CLArray
@@ -43,7 +41,6 @@ import scala.util.matching.Regex.quoteReplacement
4341

4442
trait CodeConversion
4543
extends OpenCLConverter
46-
// with StreamTransformers
4744
with StreamTransforms
4845
with CodeConversionResults
4946
with UniverseCasts {

src/main/scala/scalacl/impl/conversion/CodeConversionResults.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
*/
3131
package scalacl.impl
32-
// import scalacl.impl.FlatCode
3332
import scalacl.impl.FlatCodes._
3433

3534
import scalacl.CLArray

0 commit comments

Comments
 (0)