summaryrefslogtreecommitdiff
path: root/test/files/specialized
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-06-07 14:26:35 +0200
committerAleksandar Prokopec <axel22@gmail.com>2012-06-07 19:21:45 +0200
commit881641f83461b5fc23ab25d1efa08b7a760a3363 (patch)
tree5ed07883b14c77d6020c2e99e50f3407587495e6 /test/files/specialized
parent6cdb6b0299cb917ac3df9e39aa932bacdc31faf9 (diff)
downloadscala-881641f83461b5fc23ab25d1efa08b7a760a3363.tar.gz
scala-881641f83461b5fc23ab25d1efa08b7a760a3363.tar.bz2
scala-881641f83461b5fc23ab25d1efa08b7a760a3363.zip
Add the first iteration of the `util.hashing` package.
Move `MurmurHash3` to `util.hashing`. Make the `class` private and retain a public companion `object`, and put the `MurmurHash3.Hashing` implementations for various types in the companion. Add a method which composes `ByteswapHashing` with some other hashing. Rename `hashOf` to `hash`. Fix chi-square test in a test-case. Review by @jsuereth. Moved a failing test that seems to use some other library version to pending.
Diffstat (limited to 'test/files/specialized')
-rw-r--r--test/files/specialized/SI-5005.check33
-rw-r--r--test/files/specialized/SI-5005.scala27
2 files changed, 0 insertions, 60 deletions
diff --git a/test/files/specialized/SI-5005.check b/test/files/specialized/SI-5005.check
deleted file mode 100644
index 81e8342dad..0000000000
--- a/test/files/specialized/SI-5005.check
+++ /dev/null
@@ -1,33 +0,0 @@
-[[syntax trees at end of specialize]] // newSource1
-package <empty> {
- class C2[@specialized(scala.Boolean) U >: Nothing <: Any] extends Object {
- def <init>(): C2[U] = {
- C2.super.<init>();
- ()
- };
- def apply(x: U): U = x;
- <specialized> def apply$mcZ$sp(x: Boolean): Boolean = C2.this.apply(x.asInstanceOf[U]()).asInstanceOf[Boolean]()
- };
- class B extends Object {
- def <init>(): B = {
- B.super.<init>();
- ()
- };
- new C2$mcZ$sp().apply$mcZ$sp(true)
- };
- <specialized> class C2$mcZ$sp extends C2[Boolean] {
- <specialized> def <init>(): C2$mcZ$sp = {
- C2$mcZ$sp.super.<init>();
- ()
- };
- @inline final override <specialized> def apply(x: Boolean): Boolean = C2$mcZ$sp.this.apply$mcZ$sp(x);
- @inline final override <specialized> def apply$mcZ$sp(x: Boolean): Boolean = x
- }
-}
-
-[log inliner] Analyzing C2.apply count 0 with 1 blocks
-[log inliner] C2.apply blocks before inlining: 1 (2) after: 1 (2)
-[log inliner] Analyzing C2.apply$mcZ$sp count 0 with 1 blocks
-[log inliner] C2.apply$mcZ$sp blocks before inlining: 1 (8) after: 1 (8)
-[log inliner] Not inlining into apply because it is marked @inline.
-[log inliner] Not inlining into apply$mcZ$sp because it is marked @inline.
diff --git a/test/files/specialized/SI-5005.scala b/test/files/specialized/SI-5005.scala
deleted file mode 100644
index 3d1ada49e2..0000000000
--- a/test/files/specialized/SI-5005.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-import scala.tools.partest._
-import java.io._
-
-object Test extends DirectTest {
-
- override def extraSettings: String = "-usejavacp -Xprint:spec -optimize -Ylog:inliner -d " + testOutput.path
-
- override def code = """
- class C2[@specialized(Boolean) U]() {
- @inline final def apply(x: U): U = x
- }
-
- class B {
- (new C2[Boolean]())(true)
- }
- """
-
- override def show(): Unit = {
- // redirect err to out, for inliner log
- val prevErr = System.err
- System.setErr(System.out)
- compile()
- System.setErr(prevErr)
- }
-
- override def isDebug = false // so we don't get the newSettings warning
-}